Say hello to QtQuick module

This change moves the QtQuick 2 types and C++ API (including
SceneGraph) to a new module (AKA library), QtQuick.

99% of this change is moving files from src/declarative to
src/quick, and from tests/auto/declarative to
tests/auto/qtquick2.

The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to
a plugin, src/imports/qtquick2, just like it's done for QtQuick 1.

All tools, examples, and tests that use QtQuick C++ API have gotten
"QT += quick" or "QT += quick-private" added to their .pro file.

A few additional internal QtDeclarative classes had to be exported
(via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the
QtQuick 2 implementation.

The old header locations (e.g. QtDeclarative/qquickitem.h) will
still be supported for some time, but will produce compile-time
warnings. (To avoid the QtQuick implementation using the
compatibility headers (since QtDeclarative's includepath comes
first), a few include statements were modified, e.g. from
"#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".)

There's a change in qtbase that automatically adds QtQuick to the
module list if QtDeclarative is used. Together with the compatibility
headers, this should help reduce the migration pain for existing
projects.

In theory, simply getting an existing QtDeclarative-based project
to compile and link shouldn't require any changes for now -- but
porting to the new scheme is of course recommended, and will
eventually become mandatory.

Task-number: QTBUG-22889
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>

1 files changed, 0 insertions, 1865 deletions

diff --git a/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
deleted file mode 100644
index 0278b0cf2c..0000000000
--- a/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ /dev/null
@@ -1,1865 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** 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.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "../shared/util.h"
-#include <qtest.h>
-#include <QtTest/QSignalSpy>
-#include <QStandardItemModel>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/qdeclarativecontext.h>
-#include <QtDeclarative/qdeclarativeexpression.h>
-#include <QtDeclarative/qquickview.h>
-#include <private/qquicklistview_p.h>
-#include <private/qquicktext_p.h>
-#include <private/qquickvisualdatamodel_p.h>
-#include <private/qdeclarativevaluetype_p.h>
-#include <private/qdeclarativechangeset_p.h>
-#include <private/qdeclarativeengine_p.h>
-#include <math.h>
-
-template <typename T, int N> int lengthOf(const T (&)[N]) { return N; }
-
-static void initStandardTreeModel(QStandardItemModel *model)
-{
-    QStandardItem *item;
-    item = new QStandardItem(QLatin1String("Row 1 Item"));
-    model->insertRow(0, item);
-
-    item = new QStandardItem(QLatin1String("Row 2 Item"));
-    item->setCheckable(true);
-    model->insertRow(1, item);
-
-    QStandardItem *childItem = new QStandardItem(QLatin1String("Row 2 Child Item"));
-    item->setChild(0, childItem);
-
-    item = new QStandardItem(QLatin1String("Row 3 Item"));
-    item->setIcon(QIcon());
-    model->insertRow(2, item);
-}
-
-class SingleRoleModel : public QAbstractListModel
-{
-    Q_OBJECT
-
-public:
-    SingleRoleModel(const QByteArray &role = "name", QObject * /* parent */ = 0) {
-        QHash<int, QByteArray> roles;
-        roles.insert(Qt::DisplayRole , role);
-        setRoleNames(roles);
-        list << "one" << "two" << "three" << "four";
-    }
-
-    void emitMove(int sourceFirst, int sourceLast, int destinationChild) {
-        emit beginMoveRows(QModelIndex(), sourceFirst, sourceLast, QModelIndex(), destinationChild);
-        emit endMoveRows();
-    }
-
-    QStringList list;
-
-public slots:
-    void set(int idx, QString string) {
-        list[idx] = string;
-        emit dataChanged(index(idx,0), index(idx,0));
-    }
-
-protected:
-    int rowCount(const QModelIndex & /* parent */ = QModelIndex()) const {
-        return list.count();
-    }
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const {
-        if (role == Qt::DisplayRole)
-            return list.at(index.row());
-        return QVariant();
-    }
-};
-
-
-class tst_qquickvisualdatamodel : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qquickvisualdatamodel();
-
-private slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void rootIndex();
-    void updateLayout_data();
-    void updateLayout();
-    void childChanged_data();
-    void childChanged();
-    void objectListModel();
-    void singleRole();
-    void modelProperties();
-    void noDelegate_data();
-    void noDelegate();
-    void itemsDestroyed_data();
-    void itemsDestroyed();
-    void qaimRowsMoved();
-    void qaimRowsMoved_data();
-    void remove_data();
-    void remove();
-    void move_data();
-    void move();
-    void groups_data();
-    void groups();
-    void invalidGroups();
-    void get();
-    void onChanged_data();
-    void onChanged();
-    void create();
-    void incompleteModel();
-
-private:
-    template <int N> void groups_verify(
-            const SingleRoleModel &model,
-            QQuickItem *contentItem,
-            const int (&mIndex)[N],
-            const int (&iIndex)[N],
-            const int (&vIndex)[N],
-            const int (&sIndex)[N],
-            const bool (&vMember)[N],
-            const bool (&sMember)[N]);
-
-    template <int N> void get_verify(
-            const SingleRoleModel &model,
-            QQuickVisualDataModel *visualModel,
-            QQuickVisualDataGroup *visibleItems,
-            QQuickVisualDataGroup *selectedItems,
-            const int (&mIndex)[N],
-            const int (&iIndex)[N],
-            const int (&vIndex)[N],
-            const int (&sIndex)[N],
-            const bool (&vMember)[N],
-            const bool (&sMember)[N]);
-
-    bool failed;
-    QDeclarativeEngine engine;
-    template<typename T>
-    T *findItem(QQuickItem *parent, const QString &objectName, int index);
-};
-
-Q_DECLARE_METATYPE(QDeclarativeChangeSet)
-
-void tst_qquickvisualdatamodel::initTestCase()
-{
-    qRegisterMetaType<QDeclarativeChangeSet>();
-}
-
-void tst_qquickvisualdatamodel::cleanupTestCase()
-{
-
-}
-class DataObject : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-    Q_PROPERTY(QString color READ color WRITE setColor NOTIFY colorChanged)
-
-public:
-    DataObject(QObject *parent=0) : QObject(parent) {}
-    DataObject(const QString &name, const QString &color, QObject *parent=0)
-        : QObject(parent), m_name(name), m_color(color) { }
-
-
-    QString name() const { return m_name; }
-    void setName(const QString &name) {
-        if (name != m_name) {
-            m_name = name;
-            emit nameChanged();
-        }
-    }
-
-    QString color() const { return m_color; }
-    void setColor(const QString &color) {
-        if (color != m_color) {
-            m_color = color;
-            emit colorChanged();
-        }
-    }
-
-signals:
-    void nameChanged();
-    void colorChanged();
-
-private:
-    QString m_name;
-    QString m_color;
-};
-
-template <typename T> static T evaluate(QObject *scope, const QString &expression)
-{
-    QDeclarativeExpression expr(qmlContext(scope), scope, expression);
-    T result = expr.evaluate().value<T>();
-    if (expr.hasError())
-        qWarning() << expr.error().toString();
-    return result;
-}
-
-template <> void evaluate<void>(QObject *scope, const QString &expression)
-{
-    QDeclarativeExpression expr(qmlContext(scope), scope, expression);
-    expr.evaluate();
-    if (expr.hasError())
-        qWarning() << expr.error().toString();
-}
-
-tst_qquickvisualdatamodel::tst_qquickvisualdatamodel()
-{
-}
-
-void tst_qquickvisualdatamodel::rootIndex()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("visualdatamodel.qml")));
-
-    QStandardItemModel model;
-    initStandardTreeModel(&model);
-
-    engine.rootContext()->setContextProperty("myModel", &model);
-
-    QQuickVisualDataModel *obj = qobject_cast<QQuickVisualDataModel*>(c.create());
-    QVERIFY(obj != 0);
-
-    QMetaObject::invokeMethod(obj, "setRoot");
-    QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == model.index(0,0));
-
-    QMetaObject::invokeMethod(obj, "setRootToParent");
-    QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == QModelIndex());
-
-    QMetaObject::invokeMethod(obj, "setRoot");
-    QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == model.index(0,0));
-    model.clear(); // will emit modelReset()
-    QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == QModelIndex());
-
-    delete obj;
-}
-
-void tst_qquickvisualdatamodel::updateLayout_data()
-{
-    QTest::addColumn<QUrl>("source");
-
-    QTest::newRow("item delegate") << QUrl::fromLocalFile(TESTDATA("datalist.qml"));
-    QTest::newRow("package delegate") << QUrl::fromLocalFile(TESTDATA("datalist-package.qml"));
-}
-
-void tst_qquickvisualdatamodel::updateLayout()
-{
-    QFETCH(QUrl, source);
-
-    QQuickView view;
-
-    QStandardItemModel model;
-    initStandardTreeModel(&model);
-
-    view.rootContext()->setContextProperty("myModel", &model);
-
-    view.setSource(source);
-
-    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-    QVERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QVERIFY(contentItem != 0);
-
-    QQuickText *name = findItem<QQuickText>(contentItem, "display", 0);
-    QVERIFY(name);
-    QCOMPARE(name->text(), QString("Row 1 Item"));
-    name = findItem<QQuickText>(contentItem, "display", 1);
-    QVERIFY(name);
-    QCOMPARE(name->text(), QString("Row 2 Item"));
-    name = findItem<QQuickText>(contentItem, "display", 2);
-    QVERIFY(name);
-    QCOMPARE(name->text(), QString("Row 3 Item"));
-
-    model.invisibleRootItem()->sortChildren(0, Qt::DescendingOrder);
-
-    name = findItem<QQuickText>(contentItem, "display", 0);
-    QVERIFY(name);
-    QCOMPARE(name->text(), QString("Row 3 Item"));
-    name = findItem<QQuickText>(contentItem, "display", 1);
-    QVERIFY(name);
-    QCOMPARE(name->text(), QString("Row 2 Item"));
-    name = findItem<QQuickText>(contentItem, "display", 2);
-    QVERIFY(name);
-    QCOMPARE(name->text(), QString("Row 1 Item"));
-}
-
-void tst_qquickvisualdatamodel::childChanged_data()
-{
-    QTest::addColumn<QUrl>("source");
-
-    QTest::newRow("item delegate") << QUrl::fromLocalFile(TESTDATA("datalist.qml"));
-    QTest::newRow("package delegate") << QUrl::fromLocalFile(TESTDATA("datalist-package.qml"));
-}
-
-void tst_qquickvisualdatamodel::childChanged()
-{
-    QFETCH(QUrl, source);
-
-    QQuickView view;
-
-    QStandardItemModel model;
-    initStandardTreeModel(&model);
-
-    view.rootContext()->setContextProperty("myModel", &model);
-
-    view.setSource(source);
-
-    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-    QVERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QVERIFY(contentItem != 0);
-
-    QQuickVisualDataModel *vdm = listview->findChild<QQuickVisualDataModel*>("visualModel");
-    vdm->setRootIndex(QVariant::fromValue(model.indexFromItem(model.item(1,0))));
-    QCOMPARE(listview->count(), 1);
-
-    QQuickText *name = findItem<QQuickText>(contentItem, "display", 0);
-    QVERIFY(name);
-    QCOMPARE(name->text(), QString("Row 2 Child Item"));
-
-    model.item(1,0)->child(0,0)->setText("Row 2 updated child");
-
-    name = findItem<QQuickText>(contentItem, "display", 0);
-    QVERIFY(name);
-    QCOMPARE(name->text(), QString("Row 2 updated child"));
-
-    model.item(1,0)->appendRow(new QStandardItem(QLatin1String("Row 2 Child Item 2")));
-    QCOMPARE(listview->count(), 2);
-
-    name = findItem<QQuickText>(contentItem, "display", 1);
-    QVERIFY(name != 0);
-    QCOMPARE(name->text(), QString("Row 2 Child Item 2"));
-
-    model.item(1,0)->takeRow(1);
-    name = findItem<QQuickText>(contentItem, "display", 1);
-    QVERIFY(name == 0);
-
-    vdm->setRootIndex(QVariant::fromValue(QModelIndex()));
-    QCOMPARE(listview->count(), 3);
-    name = findItem<QQuickText>(contentItem, "display", 0);
-    QVERIFY(name);
-    QCOMPARE(name->text(), QString("Row 1 Item"));
-    name = findItem<QQuickText>(contentItem, "display", 1);
-    QVERIFY(name);
-    QCOMPARE(name->text(), QString("Row 2 Item"));
-    name = findItem<QQuickText>(contentItem, "display", 2);
-    QVERIFY(name);
-    QCOMPARE(name->text(), QString("Row 3 Item"));
-}
-
-void tst_qquickvisualdatamodel::objectListModel()
-{
-    QQuickView view;
-
-    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));
-
-    view.setSource(QUrl::fromLocalFile(TESTDATA("objectlist.qml")));
-
-    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-    QVERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QVERIFY(contentItem != 0);
-
-    QQuickText *name = findItem<QQuickText>(contentItem, "name", 0);
-    QCOMPARE(name->text(), QString("Item 1"));
-
-    QQuickText *section = findItem<QQuickText>(contentItem, "section", 0);
-    QCOMPARE(section->text(), QString("Item 1"));
-
-    dataList[0]->setProperty("name", QLatin1String("Changed"));
-    QCOMPARE(name->text(), QString("Changed"));
-}
-
-void tst_qquickvisualdatamodel::singleRole()
-{
-    {
-        QQuickView view;
-
-        SingleRoleModel model;
-
-        QDeclarativeContext *ctxt = view.rootContext();
-        ctxt->setContextProperty("myModel", &model);
-
-        view.setSource(QUrl::fromLocalFile(TESTDATA("singlerole1.qml")));
-
-        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-        QVERIFY(listview != 0);
-
-        QQuickItem *contentItem = listview->contentItem();
-        QVERIFY(contentItem != 0);
-
-        QQuickText *name = findItem<QQuickText>(contentItem, "name", 1);
-        QCOMPARE(name->text(), QString("two"));
-
-        model.set(1, "Changed");
-        QCOMPARE(name->text(), QString("Changed"));
-    }
-    {
-        QQuickView view;
-
-        SingleRoleModel model;
-
-        QDeclarativeContext *ctxt = view.rootContext();
-        ctxt->setContextProperty("myModel", &model);
-
-        view.setSource(QUrl::fromLocalFile(TESTDATA("singlerole2.qml")));
-
-        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-        QVERIFY(listview != 0);
-
-        QQuickItem *contentItem = listview->contentItem();
-        QVERIFY(contentItem != 0);
-
-        QQuickText *name = findItem<QQuickText>(contentItem, "name", 1);
-        QCOMPARE(name->text(), QString("two"));
-
-        model.set(1, "Changed");
-        QCOMPARE(name->text(), QString("Changed"));
-    }
-    {
-        QQuickView view;
-
-        SingleRoleModel model("modelData");
-
-        QDeclarativeContext *ctxt = view.rootContext();
-        ctxt->setContextProperty("myModel", &model);
-
-        view.setSource(QUrl::fromLocalFile(TESTDATA("singlerole2.qml")));
-
-        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-        QVERIFY(listview != 0);
-
-        QQuickItem *contentItem = listview->contentItem();
-        QVERIFY(contentItem != 0);
-
-        QQuickText *name = findItem<QQuickText>(contentItem, "name", 1);
-        QCOMPARE(name->text(), QString("two"));
-
-        model.set(1, "Changed");
-        QCOMPARE(name->text(), QString("Changed"));
-    }
-}
-
-void tst_qquickvisualdatamodel::modelProperties()
-{
-    {
-        QQuickView view;
-
-        SingleRoleModel model;
-
-        QDeclarativeContext *ctxt = view.rootContext();
-        ctxt->setContextProperty("myModel", &model);
-
-        view.setSource(QUrl::fromLocalFile(TESTDATA("modelproperties.qml")));
-
-        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-        QVERIFY(listview != 0);
-
-        QQuickItem *contentItem = listview->contentItem();
-        QVERIFY(contentItem != 0);
-
-        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", 1);
-        QVERIFY(delegate);
-        QCOMPARE(delegate->property("test1").toString(),QString("two"));
-        QCOMPARE(delegate->property("test2").toString(),QString("two"));
-        QCOMPARE(delegate->property("test3").toString(),QString("two"));
-        QCOMPARE(delegate->property("test4").toString(),QString("two"));
-        QVERIFY(!delegate->property("test9").isValid());
-        QCOMPARE(delegate->property("test5").toString(),QString(""));
-        QVERIFY(delegate->property("test6").value<QObject*>() != 0);
-        QCOMPARE(delegate->property("test7").toInt(),1);
-        QCOMPARE(delegate->property("test8").toInt(),1);
-    }
-
-    {
-        QQuickView view;
-
-        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));
-
-        view.setSource(QUrl::fromLocalFile(TESTDATA("modelproperties.qml")));
-
-        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-        QVERIFY(listview != 0);
-
-        QQuickItem *contentItem = listview->contentItem();
-        QVERIFY(contentItem != 0);
-
-        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", 1);
-        QVERIFY(delegate);
-        QCOMPARE(delegate->property("test1").toString(),QString("Item 2"));
-        QCOMPARE(delegate->property("test2").toString(),QString("Item 2"));
-        QVERIFY(qobject_cast<DataObject*>(delegate->property("test3").value<QObject*>()) != 0);
-        QVERIFY(qobject_cast<DataObject*>(delegate->property("test4").value<QObject*>()) != 0);
-        QCOMPARE(delegate->property("test5").toString(),QString("Item 2"));
-        QCOMPARE(delegate->property("test9").toString(),QString("Item 2"));
-        QVERIFY(delegate->property("test6").value<QObject*>() != 0);
-        QCOMPARE(delegate->property("test7").toInt(),1);
-        QCOMPARE(delegate->property("test8").toInt(),1);
-    }
-
-    {
-        QQuickView view;
-
-        QStandardItemModel model;
-        initStandardTreeModel(&model);
-
-        view.rootContext()->setContextProperty("myModel", &model);
-
-        QUrl source(QUrl::fromLocalFile(TESTDATA("modelproperties2.qml")));
-
-        //3 items, 3 i each
-        QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":13: ReferenceError: Can't find variable: modelData");
-        QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":13: ReferenceError: Can't find variable: modelData");
-        QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":13: ReferenceError: Can't find variable: modelData");
-        QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":11: ReferenceError: Can't find variable: modelData");
-        QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":11: ReferenceError: Can't find variable: modelData");
-        QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":11: ReferenceError: Can't find variable: modelData");
-        QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":17: TypeError: Cannot read property 'display' of undefined");
-        QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":17: TypeError: Cannot read property 'display' of undefined");
-        QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":17: TypeError: Cannot read property 'display' of undefined");
-
-        view.setSource(source);
-
-        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-        QVERIFY(listview != 0);
-
-        QQuickItem *contentItem = listview->contentItem();
-        QVERIFY(contentItem != 0);
-
-        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", 1);
-        QVERIFY(delegate);
-        QCOMPARE(delegate->property("test1").toString(),QString("Row 2 Item"));
-        QCOMPARE(delegate->property("test2").toString(),QString("Row 2 Item"));
-        QVERIFY(!delegate->property("test3").isValid());
-        QVERIFY(!delegate->property("test4").isValid());
-        QVERIFY(!delegate->property("test5").isValid());
-        QVERIFY(!delegate->property("test9").isValid());
-        QVERIFY(delegate->property("test6").value<QObject*>() != 0);
-        QCOMPARE(delegate->property("test7").toInt(),1);
-        QCOMPARE(delegate->property("test8").toInt(),1);
-    }
-
-    //### should also test QStringList and QVariantList
-}
-
-void tst_qquickvisualdatamodel::noDelegate_data()
-{
-    QTest::addColumn<QUrl>("source");
-
-    QTest::newRow("item delegate") << QUrl::fromLocalFile(TESTDATA("datalist.qml"));
-    QTest::newRow("package delegate") << QUrl::fromLocalFile(TESTDATA("datalist-package.qml"));
-}
-
-void tst_qquickvisualdatamodel::noDelegate()
-{
-    QFETCH(QUrl, source);
-
-    QQuickView view;
-
-    QStandardItemModel model;
-    initStandardTreeModel(&model);
-
-    view.rootContext()->setContextProperty("myModel", &model);
-
-    view.setSource(source);
-
-    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-    QVERIFY(listview != 0);
-
-    QQuickVisualDataModel *vdm = listview->findChild<QQuickVisualDataModel*>("visualModel");
-    QVERIFY(vdm != 0);
-    QCOMPARE(vdm->count(), 3);
-
-    vdm->setDelegate(0);
-    QCOMPARE(vdm->count(), 0);
-}
-
-void tst_qquickvisualdatamodel::itemsDestroyed_data()
-{
-    QTest::addColumn<QUrl>("source");
-
-    QTest::newRow("listView") << QUrl::fromLocalFile(TESTDATA("itemsDestroyed_listView.qml"));
-    QTest::newRow("package") << QUrl::fromLocalFile(TESTDATA("itemsDestroyed_package.qml"));
-    QTest::newRow("pathView") << QUrl::fromLocalFile(TESTDATA("itemsDestroyed_pathView.qml"));
-    QTest::newRow("repeater") << QUrl::fromLocalFile(TESTDATA("itemsDestroyed_repeater.qml"));
-}
-
-void tst_qquickvisualdatamodel::itemsDestroyed()
-{
-    QFETCH(QUrl, source);
-
-    QDeclarativeGuard<QQuickItem> delegate;
-
-    {
-        QQuickView view;
-        QStandardItemModel model;
-        initStandardTreeModel(&model);
-        view.rootContext()->setContextProperty("myModel", &model);
-        view.setSource(source);
-
-        view.show();
-        QTest::qWaitForWindowShown(&view);
-
-        QVERIFY(delegate = findItem<QQuickItem>(view.rootItem(), "delegate", 1));
-    }
-    QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-    QVERIFY(!delegate);
-}
-
-void tst_qquickvisualdatamodel::qaimRowsMoved()
-{
-    // Test parameters passed in QAIM::rowsMoved() signal are converted correctly
-    // when translated and emitted as the QListModelInterface::itemsMoved() signal
-    QFETCH(int, sourceFirst);
-    QFETCH(int, sourceLast);
-    QFETCH(int, destinationChild);
-    QFETCH(int, expectFrom);
-    QFETCH(int, expectTo);
-    QFETCH(int, expectCount);
-
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("visualdatamodel.qml")));
-
-    SingleRoleModel model;
-    model.list.clear();
-    for (int i=0; i<30; i++)
-        model.list << ("item " + i);
-    engine.rootContext()->setContextProperty("myModel", &model);
-
-    QQuickVisualDataModel *obj = qobject_cast<QQuickVisualDataModel*>(c.create());
-    QVERIFY(obj != 0);
-
-    QSignalSpy spy(obj, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)));
-    model.emitMove(sourceFirst, sourceLast, destinationChild);
-    // QAbstractItemModel also emits the changed signal when items are moved.
-    QCOMPARE(spy.count(), 2);
-
-    bool move = false;
-    for (int i = 0; i < 2; ++i) {
-        QCOMPARE(spy[1].count(), 2);
-        QDeclarativeChangeSet changeSet = spy[i][0].value<QDeclarativeChangeSet>();
-        if (!changeSet.changes().isEmpty())
-            continue;
-        move = true;
-        QCOMPARE(changeSet.removes().count(), 1);
-        QCOMPARE(changeSet.removes().at(0).index, expectFrom);
-        QCOMPARE(changeSet.removes().at(0).count, expectCount);
-        QCOMPARE(changeSet.inserts().count(), 1);
-        QCOMPARE(changeSet.inserts().at(0).index, expectTo);
-        QCOMPARE(changeSet.inserts().at(0).count, expectCount);
-        QCOMPARE(changeSet.removes().at(0).moveId, changeSet.inserts().at(0).moveId);
-        QCOMPARE(spy[i][1].toBool(), false);
-    }
-    QVERIFY(move);
-
-    delete obj;
-}
-
-void tst_qquickvisualdatamodel::qaimRowsMoved_data()
-{
-    QTest::addColumn<int>("sourceFirst");
-    QTest::addColumn<int>("sourceLast");
-    QTest::addColumn<int>("destinationChild");
-    QTest::addColumn<int>("expectFrom");
-    QTest::addColumn<int>("expectTo");
-    QTest::addColumn<int>("expectCount");
-
-    QTest::newRow("move 1 forward")
-        << 1 << 1 << 6
-        << 1 << 5 << 1;
-
-    QTest::newRow("move 1 backwards")
-        << 4 << 4 << 1
-        << 4 << 1 << 1;
-
-    QTest::newRow("move multiple forwards")
-        << 0 << 2 << 13
-        << 0 << 10 << 3;
-
-    QTest::newRow("move multiple forwards, with same to")
-        << 0 << 1 << 3
-        << 0 << 1 << 2;
-
-    QTest::newRow("move multiple backwards")
-        << 10 << 14 << 1
-        << 10 << 1 << 5;
-}
-
-void tst_qquickvisualdatamodel::remove_data()
-{
-    QTest::addColumn<QUrl>("source");
-    QTest::addColumn<QString>("package delegate");
-
-    QTest::newRow("item delegate")
-            << QUrl::fromLocalFile(TESTDATA("groups.qml"))
-            << QString();
-    QTest::newRow("package")
-            << QUrl::fromLocalFile(TESTDATA("groups-package.qml"))
-            << QString("package.");
-}
-
-void tst_qquickvisualdatamodel::remove()
-{
-    QQuickView view;
-
-    SingleRoleModel model;
-    model.list = QStringList()
-            << "one"
-            << "two"
-            << "three"
-            << "four"
-            << "five"
-            << "six"
-            << "seven"
-            << "eight"
-            << "nine"
-            << "ten"
-            << "eleven"
-            << "twelve";
-
-    QDeclarativeContext *ctxt = view.rootContext();
-    ctxt->setContextProperty("myModel", &model);
-
-    view.setSource(QUrl::fromLocalFile(TESTDATA("groups.qml")));
-
-    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-    QVERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QVERIFY(contentItem != 0);
-
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
-    QVERIFY(visualModel);
-
-    {
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        static const int mIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-
-        for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
-            QVERIFY(delegate);
-            QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
-            QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
-            QCOMPARE(delegate->property("test3").toInt(), iIndex[i]);
-        }
-    } {
-        evaluate<void>(visualModel, "items.remove(2)");
-        QCOMPARE(listview->count(), 11);
-        QCOMPARE(visualModel->items()->count(), 11);
-        static const int mIndex[] = { 0, 1, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10 };
-
-        for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
-            QVERIFY(delegate);
-            QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
-            QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
-            QCOMPARE(delegate->property("test3").toInt(), iIndex[i]);
-        }
-    } {
-        evaluate<void>(visualModel, "items.remove(1, 4)");
-        QCOMPARE(listview->count(), 7);
-        QCOMPARE(visualModel->items()->count(), 7);
-        static const int mIndex[] = { 0, 6, 7, 8, 9,10,11 };
-        static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6 };
-
-        for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
-            QVERIFY(delegate);
-            QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
-            QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
-            QCOMPARE(delegate->property("test3").toInt(), iIndex[i]);
-        }
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: remove: index out of range");
-        evaluate<void>(visualModel, "items.remove(-8, 4)");
-        QCOMPARE(listview->count(), 7);
-        QCOMPARE(visualModel->items()->count(), 7);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: remove: index out of range");
-        evaluate<void>(visualModel, "items.remove(12, 2)");
-        QCOMPARE(listview->count(), 7);
-        QCOMPARE(visualModel->items()->count(), 7);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: remove: index out of range");
-        evaluate<void>(visualModel, "items.remove(5, 3)");
-        QCOMPARE(listview->count(), 7);
-        QCOMPARE(visualModel->items()->count(), 7);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: remove: invalid count");
-        evaluate<void>(visualModel, "items.remove(5, -2)");
-        QCOMPARE(listview->count(), 7);
-        QCOMPARE(visualModel->items()->count(), 7);
-    }
-}
-
-void tst_qquickvisualdatamodel::move_data()
-{
-    QTest::addColumn<QUrl>("source");
-    QTest::addColumn<QString>("package delegate");
-
-    QTest::newRow("item delegate")
-            << QUrl::fromLocalFile(TESTDATA("groups.qml"))
-            << QString();
-    QTest::newRow("package")
-            << QUrl::fromLocalFile(TESTDATA("groups-package.qml"))
-            << QString("package.");
-}
-
-void tst_qquickvisualdatamodel::move()
-{
-    QQuickView view;
-
-    SingleRoleModel model;
-    model.list = QStringList()
-            << "one"
-            << "two"
-            << "three"
-            << "four"
-            << "five"
-            << "six"
-            << "seven"
-            << "eight"
-            << "nine"
-            << "ten"
-            << "eleven"
-            << "twelve";
-
-    QDeclarativeContext *ctxt = view.rootContext();
-    ctxt->setContextProperty("myModel", &model);
-
-    view.setSource(QUrl::fromLocalFile(TESTDATA("groups.qml")));
-
-    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-    QVERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QVERIFY(contentItem != 0);
-
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
-    QVERIFY(visualModel);
-
-    {
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        static const int mIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-
-        for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
-            QVERIFY(delegate);
-            QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
-            QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
-            QCOMPARE(delegate->property("test3").toInt(), iIndex[i]);
-        }
-    } {
-        evaluate<void>(visualModel, "items.move(2, 4)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        static const int mIndex[] = { 0, 1, 3, 4, 2, 5, 6, 7, 8, 9,10,11 };
-        static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-
-        for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
-            QVERIFY(delegate);
-            QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
-            QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
-            QCOMPARE(delegate->property("test3").toInt(), iIndex[i]);
-        }
-    } {
-        evaluate<void>(visualModel, "items.move(4, 2)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        static const int mIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-
-        for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
-            QVERIFY(delegate);
-            QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
-            QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
-            QCOMPARE(delegate->property("test3").toInt(), iIndex[i]);
-        }
-    } {
-        evaluate<void>(visualModel, "items.move(8, 0, 4)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        static const int mIndex[] = { 8, 9,10,11, 0, 1, 2, 3, 4, 5, 6, 7 };
-        static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-
-        for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
-            QVERIFY(delegate);
-            QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
-            QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
-            QCOMPARE(delegate->property("test3").toInt(), iIndex[i]);
-        }
-    } {
-        evaluate<void>(visualModel, "items.move(3, 4, 5)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        static const int mIndex[] = { 8, 9,10,4, 11, 0, 1, 2, 3, 5, 6, 7 };
-        static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-
-        for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
-            QVERIFY(delegate);
-            QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
-            QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
-            QCOMPARE(delegate->property("test3").toInt(), iIndex[i]);
-        }
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: move: invalid count");
-        evaluate<void>(visualModel, "items.move(5, 2, -2)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: move: from index out of range");
-        evaluate<void>(visualModel, "items.move(-6, 2, 1)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: move: from index out of range");
-        evaluate<void>(visualModel, "items.move(15, 2, 1)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: move: from index out of range");
-        evaluate<void>(visualModel, "items.move(11, 1, 3)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: move: to index out of range");
-        evaluate<void>(visualModel, "items.move(2, -5, 1)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: move: to index out of range");
-        evaluate<void>(visualModel, "items.move(2, 14, 1)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: move: to index out of range");
-        evaluate<void>(visualModel, "items.move(2, 11, 4)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-    }
-}
-
-void tst_qquickvisualdatamodel::groups_data()
-{
-    QTest::addColumn<QUrl>("source");
-    QTest::addColumn<QString>("part");
-
-    QTest::newRow("item delegate")
-            << QUrl::fromLocalFile(TESTDATA("groups.qml"))
-            << QString();
-    QTest::newRow("package")
-            << QUrl::fromLocalFile(TESTDATA("groups-package.qml"))
-            << QString("visualModel.parts.package.");
-}
-
-template <int N> void tst_qquickvisualdatamodel::groups_verify(
-        const SingleRoleModel &model,
-        QQuickItem *contentItem,
-        const int (&mIndex)[N],
-        const int (&iIndex)[N],
-        const int (&vIndex)[N],
-        const int (&sIndex)[N],
-        const bool (&vMember)[N],
-        const bool (&sMember)[N])
-{
-    failed = true;
-    for (int i = 0; i < N; ++i) {
-        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
-        QVERIFY(delegate);
-        QCOMPARE(evaluate<QString>(delegate, "test1"), model.list.at(mIndex[i]));
-        QCOMPARE(evaluate<int>(delegate, "test2") , mIndex[i]);
-        QCOMPARE(evaluate<int>(delegate, "test3") , iIndex[i]);
-        QCOMPARE(evaluate<bool>(delegate, "test4"), true);
-        QCOMPARE(evaluate<int>(delegate, "test5") , vIndex[i]);
-        QCOMPARE(evaluate<bool>(delegate, "test6"), vMember[i]);
-        QCOMPARE(evaluate<int>(delegate, "test7") , sIndex[i]);
-        QCOMPARE(evaluate<bool>(delegate, "test8"), sMember[i]);
-        QCOMPARE(evaluate<QStringList>(delegate, "test9").contains("items")   , QBool(true));
-        QCOMPARE(evaluate<QStringList>(delegate, "test9").contains("visible") , QBool(vMember[i]));
-        QCOMPARE(evaluate<QStringList>(delegate, "test9").contains("selected"), QBool(sMember[i]));
-    }
-    failed = false;
-}
-
-#define VERIFY_GROUPS \
-    groups_verify(model, contentItem, mIndex, iIndex, vIndex, sIndex, vMember, sMember); \
-    QVERIFY(!failed)
-
-
-void tst_qquickvisualdatamodel::groups()
-{
-    QFETCH(QUrl, source);
-    QFETCH(QString, part);
-
-    QQuickView view;
-
-    SingleRoleModel model;
-    model.list = QStringList()
-            << "one"
-            << "two"
-            << "three"
-            << "four"
-            << "five"
-            << "six"
-            << "seven"
-            << "eight"
-            << "nine"
-            << "ten"
-            << "eleven"
-            << "twelve";
-
-    QDeclarativeContext *ctxt = view.rootContext();
-    ctxt->setContextProperty("myModel", &model);
-
-    view.setSource(source);
-
-    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-    QVERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QVERIFY(contentItem != 0);
-
-    QQuickVisualDataModel *visualModel = listview->findChild<QQuickVisualDataModel *>("visualModel");
-    QVERIFY(visualModel);
-
-    QQuickVisualDataGroup *visibleItems = listview->findChild<QQuickVisualDataGroup *>("visibleItems");
-    QVERIFY(visibleItems);
-
-    QQuickVisualDataGroup *selectedItems = listview->findChild<QQuickVisualDataGroup *>("selectedItems");
-    QVERIFY(selectedItems);
-
-    const bool f = false;
-    const bool t = true;
-
-    {
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 12);
-        QCOMPARE(selectedItems->count(), 0);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const bool vMember[] = { t, t, t, t, t, t, t, t, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-        static const bool sMember[] = { f, f, f, f, f, f, f, f, f, f, f, f };
-        VERIFY_GROUPS;
-    } {
-        evaluate<void>(visualModel, "items.addGroups(8, \"selected\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 12);
-        QCOMPARE(selectedItems->count(), 1);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const bool vMember[] = { t, t, t, t, t, t, t, t, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1 };
-        static const bool sMember[] = { f, f, f, f, f, f, f, f, t, f, f, f };
-        VERIFY_GROUPS;
-    } {
-        evaluate<void>(visualModel, "items.addGroups(6, 4, [\"visible\", \"selected\"])");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 12);
-        QCOMPARE(selectedItems->count(), 4);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const bool vMember[] = { t, t, t, t, t, t, t, t, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 4 };
-        static const bool sMember[] = { f, f, f, f, f, f, t, t, t, t, f, f };
-        VERIFY_GROUPS;
-    } {
-        evaluate<void>(visualModel, "items.setGroups(2, [\"items\", \"selected\"])");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 11);
-        QCOMPARE(selectedItems->count(), 5);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 2, 3, 4, 5, 6, 7, 8, 9,10 };
-        static const bool vMember[] = { t, t, f, t, t, t, t, t, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 1, 1, 1, 1, 2, 3, 4, 5, 5 };
-        static const bool sMember[] = { f, f, t, f, f, f, t, t, t, t, f, f };
-        VERIFY_GROUPS;
-    } {
-        evaluate<void>(selectedItems, "setGroups(0, 3, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 2, 3, 4, 5, 5, 5, 6, 7, 8 };
-        static const bool vMember[] = { t, t, f, t, t, t, f, f, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2 };
-        static const bool sMember[] = { f, f, f, f, f, f, f, f, t, t, f, f };
-        VERIFY_GROUPS;
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: addGroups: invalid count");
-        evaluate<void>(visualModel, "items.addGroups(11, -4, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: addGroups: index out of range");
-        evaluate<void>(visualModel, "items.addGroups(-1, 3, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: addGroups: index out of range");
-        evaluate<void>(visualModel, "items.addGroups(14, 3, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: addGroups: index out of range");
-        evaluate<void>(visualModel, "items.addGroups(11, 5, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: setGroups: invalid count");
-        evaluate<void>(visualModel, "items.setGroups(11, -4, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: setGroups: index out of range");
-        evaluate<void>(visualModel, "items.setGroups(-1, 3, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: setGroups: index out of range");
-        evaluate<void>(visualModel, "items.setGroups(14, 3, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: setGroups: index out of range");
-        evaluate<void>(visualModel, "items.setGroups(11, 5, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: removeGroups: invalid count");
-        evaluate<void>(visualModel, "items.removeGroups(11, -4, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: removeGroups: index out of range");
-        evaluate<void>(visualModel, "items.removeGroups(-1, 3, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: removeGroups: index out of range");
-        evaluate<void>(visualModel, "items.removeGroups(14, 3, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-    } {
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: removeGroups: index out of range");
-        evaluate<void>(visualModel, "items.removeGroups(11, 5, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-    } {
-        evaluate<void>(visualModel, part + "filterOnGroup = \"visible\"");
-        QCOMPARE(listview->count(), 9);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-        QCOMPARE(evaluate<QString>(visualModel, part + "filterOnGroup"), QString("visible"));
-    } {
-        evaluate<void>(visualModel, part + "filterOnGroup = \"selected\"");
-        QCOMPARE(listview->count(), 2);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-        QCOMPARE(evaluate<QString>(visualModel, part + "filterOnGroup"), QString("selected"));
-    } {
-        evaluate<void>(visualModel, part + "filterOnGroup = undefined");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-        QCOMPARE(evaluate<QString>(visualModel, part + "filterOnGroup"), QString("items"));
-    } {
-        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", 5);
-        QVERIFY(delegate);
-
-        evaluate<void>(delegate, "hide()");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 8);
-        QCOMPARE(selectedItems->count(), 2);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 2, 3, 4, 4, 4, 4, 5, 6, 7 };
-        static const bool vMember[] = { t, t, f, t, t, f, f, f, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2 };
-        static const bool sMember[] = { f, f, f, f, f, f, f, f, t, t, f, f };
-        VERIFY_GROUPS;
-    } {
-        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", 5);
-        QVERIFY(delegate);
-
-        evaluate<void>(delegate, "select()");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 8);
-        QCOMPARE(selectedItems->count(), 3);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 2, 3, 4, 4, 4, 4, 5, 6, 7 };
-        static const bool vMember[] = { t, t, f, t, t, f, f, f, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 3, 3 };
-        static const bool sMember[] = { f, f, f, f, f, t, f, f, t, t, f, f };
-        VERIFY_GROUPS;
-    } {
-        evaluate<void>(visualModel, "items.move(2, 6, 3)");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 8);
-        QCOMPARE(selectedItems->count(), 3);
-        static const int  mIndex [] = { 0, 1, 5, 6, 7, 8, 2, 3, 4, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 2, 2, 2, 3, 3, 4, 5, 6, 7 };
-        static const bool vMember[] = { t, t, f, f, f, t, f, t, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 3, 3 };
-        static const bool sMember[] = { f, f, t, f, f, t, f, f, f, t, f, f };
-        VERIFY_GROUPS;
-    }
-}
-
-template <int N> void tst_qquickvisualdatamodel::get_verify(
-        const SingleRoleModel &model,
-        QQuickVisualDataModel *visualModel,
-        QQuickVisualDataGroup *visibleItems,
-        QQuickVisualDataGroup *selectedItems,
-        const int (&mIndex)[N],
-        const int (&iIndex)[N],
-        const int (&vIndex)[N],
-        const int (&sIndex)[N],
-        const bool (&vMember)[N],
-        const bool (&sMember)[N])
-{
-    failed = true;
-    for (int i = 0; i < N; ++i) {
-        QCOMPARE(evaluate<QString>(visualModel, QString("items.get(%1).model.name").arg(i)), model.list.at(mIndex[i]));
-        QCOMPARE(evaluate<QString>(visualModel, QString("items.get(%1).model.modelData").arg(i)), model.list.at(mIndex[i]));
-        QCOMPARE(evaluate<int>(visualModel, QString("items.get(%1).model.index").arg(i)), mIndex[i]);
-        QCOMPARE(evaluate<int>(visualModel, QString("items.get(%1).itemsIndex").arg(i)), iIndex[i]);
-        QCOMPARE(evaluate<bool>(visualModel, QString("items.get(%1).inItems").arg(i)), true);
-        QCOMPARE(evaluate<int>(visualModel, QString("items.get(%1).visibleIndex").arg(i)), vIndex[i]);
-        QCOMPARE(evaluate<bool>(visualModel, QString("items.get(%1).inVisible").arg(i)), vMember[i]);
-        QCOMPARE(evaluate<int>(visualModel, QString("items.get(%1).selectedIndex").arg(i)), sIndex[i]);
-        QCOMPARE(evaluate<bool>(visualModel, QString("items.get(%1).inSelected").arg(i)), sMember[i]);
-        QCOMPARE(evaluate<bool>(visualModel, QString("contains(items.get(%1).groups, \"items\")").arg(i)), true);
-        QCOMPARE(evaluate<bool>(visualModel, QString("contains(items.get(%1).groups, \"visible\")").arg(i)), vMember[i]);
-        QCOMPARE(evaluate<bool>(visualModel, QString("contains(items.get(%1).groups, \"selected\")").arg(i)), sMember[i]);
-
-        if (vMember[i]) {
-            QCOMPARE(evaluate<QString>(visibleItems, QString("get(%1).model.name").arg(vIndex[i])), model.list.at(mIndex[i]));
-            QCOMPARE(evaluate<QString>(visibleItems, QString("get(%1).model.modelData").arg(vIndex[i])), model.list.at(mIndex[i]));
-            QCOMPARE(evaluate<int>(visibleItems, QString("get(%1).model.index").arg(vIndex[i])), mIndex[i]);
-            QCOMPARE(evaluate<int>(visibleItems, QString("get(%1).itemsIndex").arg(vIndex[i])), iIndex[i]);
-            QCOMPARE(evaluate<bool>(visibleItems, QString("get(%1).inItems").arg(vIndex[i])), true);
-            QCOMPARE(evaluate<int>(visibleItems, QString("get(%1).visibleIndex").arg(vIndex[i])), vIndex[i]);
-            QCOMPARE(evaluate<bool>(visibleItems, QString("get(%1).inVisible").arg(vIndex[i])), vMember[i]);
-            QCOMPARE(evaluate<int>(visibleItems, QString("get(%1).selectedIndex").arg(vIndex[i])), sIndex[i]);
-            QCOMPARE(evaluate<bool>(visibleItems, QString("get(%1).inSelected").arg(vIndex[i])), sMember[i]);
-
-            QCOMPARE(evaluate<bool>(visibleItems, QString("contains(get(%1).groups, \"items\")").arg(vIndex[i])), true);
-            QCOMPARE(evaluate<bool>(visibleItems, QString("contains(get(%1).groups, \"visible\")").arg(vIndex[i])), vMember[i]);
-            QCOMPARE(evaluate<bool>(visibleItems, QString("contains(get(%1).groups, \"selected\")").arg(vIndex[i])), sMember[i]);
-        }
-        if (sMember[i]) {
-            QCOMPARE(evaluate<QString>(selectedItems, QString("get(%1).model.name").arg(sIndex[i])), model.list.at(mIndex[i]));
-            QCOMPARE(evaluate<QString>(selectedItems, QString("get(%1).model.modelData").arg(sIndex[i])), model.list.at(mIndex[i]));
-            QCOMPARE(evaluate<int>(selectedItems, QString("get(%1).model.index").arg(sIndex[i])), mIndex[i]);
-            QCOMPARE(evaluate<int>(selectedItems, QString("get(%1).itemsIndex").arg(sIndex[i])), iIndex[i]);
-            QCOMPARE(evaluate<bool>(selectedItems, QString("get(%1).inItems").arg(sIndex[i])), true);
-            QCOMPARE(evaluate<int>(selectedItems, QString("get(%1).visibleIndex").arg(sIndex[i])), vIndex[i]);
-            QCOMPARE(evaluate<bool>(selectedItems, QString("get(%1).inVisible").arg(sIndex[i])), vMember[i]);
-            QCOMPARE(evaluate<int>(selectedItems, QString("get(%1).selectedIndex").arg(sIndex[i])), sIndex[i]);
-            QCOMPARE(evaluate<bool>(selectedItems, QString("get(%1).inSelected").arg(sIndex[i])), sMember[i]);
-            QCOMPARE(evaluate<bool>(selectedItems, QString("contains(get(%1).groups, \"items\")").arg(sIndex[i])), true);
-            QCOMPARE(evaluate<bool>(selectedItems, QString("contains(get(%1).groups, \"visible\")").arg(sIndex[i])), vMember[i]);
-            QCOMPARE(evaluate<bool>(selectedItems, QString("contains(get(%1).groups, \"selected\")").arg(sIndex[i])), sMember[i]);
-        }
-    }
-    failed = false;
-}
-
-#define VERIFY_GET \
-    get_verify(model, visualModel, visibleItems, selectedItems, mIndex, iIndex, vIndex, sIndex, vMember, sMember); \
-    QVERIFY(!failed)
-
-void tst_qquickvisualdatamodel::get()
-{
-    QQuickView view;
-
-    SingleRoleModel model;
-    model.list = QStringList()
-            << "one"
-            << "two"
-            << "three"
-            << "four"
-            << "five"
-            << "six"
-            << "seven"
-            << "eight"
-            << "nine"
-            << "ten"
-            << "eleven"
-            << "twelve";
-
-    QDeclarativeContext *ctxt = view.rootContext();
-    ctxt->setContextProperty("myModel", &model);
-
-    view.setSource(QUrl::fromLocalFile(TESTDATA("groups.qml")));
-
-    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-    QVERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QVERIFY(contentItem != 0);
-
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
-    QVERIFY(visualModel);
-
-    QQuickVisualDataGroup *visibleItems = visualModel->findChild<QQuickVisualDataGroup *>("visibleItems");
-    QVERIFY(visibleItems);
-
-    QQuickVisualDataGroup *selectedItems = visualModel->findChild<QQuickVisualDataGroup *>("selectedItems");
-    QVERIFY(selectedItems);
-
-    QV8Engine *v8Engine = QDeclarativeEnginePrivate::getV8Engine(ctxt->engine());
-    QVERIFY(v8Engine);
-
-    const bool f = false;
-    const bool t = true;
-
-    {
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 12);
-        QCOMPARE(selectedItems->count(), 0);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const bool vMember[] = { t, t, t, t, t, t, t, t, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-        static const bool sMember[] = { f, f, f, f, f, f, f, f, f, f, f, f };
-        VERIFY_GET;
-    } {
-        evaluate<void>(visualModel, "items.addGroups(8, \"selected\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 12);
-        QCOMPARE(selectedItems->count(), 1);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const bool vMember[] = { t, t, t, t, t, t, t, t, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1 };
-        static const bool sMember[] = { f, f, f, f, f, f, f, f, t, f, f, f };
-        VERIFY_GET;
-    } {
-        evaluate<void>(visualModel, "items.addGroups(6, 4, [\"visible\", \"selected\"])");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 12);
-        QCOMPARE(selectedItems->count(), 4);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const bool vMember[] = { t, t, t, t, t, t, t, t, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 4 };
-        static const bool sMember[] = { f, f, f, f, f, f, t, t, t, t, f, f };
-        VERIFY_GET;
-    } {
-        evaluate<void>(visualModel, "items.setGroups(2, [\"items\", \"selected\"])");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 11);
-        QCOMPARE(selectedItems->count(), 5);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 2, 3, 4, 5, 6, 7, 8, 9,10 };
-        static const bool vMember[] = { t, t, f, t, t, t, t, t, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 1, 1, 1, 1, 2, 3, 4, 5, 5 };
-        static const bool sMember[] = { f, f, t, f, f, f, t, t, t, t, f, f };
-        VERIFY_GET;
-    } {
-        evaluate<void>(selectedItems, "setGroups(0, 3, \"items\")");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 2, 3, 4, 5, 5, 5, 6, 7, 8 };
-        static const bool vMember[] = { t, t, f, t, t, t, f, f, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2 };
-        static const bool sMember[] = { f, f, f, f, f, f, f, f, t, t, f, f };
-        VERIFY_GET;
-    } {
-        evaluate<void>(visualModel, "items.get(5).inVisible = false");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 8);
-        QCOMPARE(selectedItems->count(), 2);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 2, 3, 4, 4, 4, 4, 5, 6, 7 };
-        static const bool vMember[] = { t, t, f, t, t, f, f, f, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2 };
-        static const bool sMember[] = { f, f, f, f, f, f, f, f, t, t, f, f };
-        VERIFY_GET;
-    } {
-        evaluate<void>(visualModel, "items.get(5).inSelected = true");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 8);
-        QCOMPARE(selectedItems->count(), 3);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 2, 3, 4, 4, 4, 4, 5, 6, 7 };
-        static const bool vMember[] = { t, t, f, t, t, f, f, f, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 3, 3 };
-        static const bool sMember[] = { f, f, f, f, f, t, f, f, t, t, f, f };
-        VERIFY_GET;
-    } {
-        evaluate<void>(visualModel, "items.get(5).groups = [\"visible\", \"items\"]");
-        QCOMPARE(listview->count(), 12);
-        QCOMPARE(visualModel->items()->count(), 12);
-        QCOMPARE(visibleItems->count(), 9);
-        QCOMPARE(selectedItems->count(), 2);
-        static const int  mIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  iIndex [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
-        static const int  vIndex [] = { 0, 1, 2, 2, 3, 4, 5, 5, 5, 6, 7, 8 };
-        static const bool vMember[] = { t, t, f, t, t, t, f, f, t, t, t, t };
-        static const int  sIndex [] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2 };
-        static const bool sMember[] = { f, f, f, f, f, f, f, f, t, t, f, f };
-        VERIFY_GET;
-    }
-}
-
-void tst_qquickvisualdatamodel::invalidGroups()
-{
-    QUrl source = QUrl::fromLocalFile(TESTDATA("groups-invalid.qml"));
-    QTest::ignoreMessage(QtWarningMsg, (source.toString() + ":12:9: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("Group names must start with a lower case letter")).toUtf8());
-
-    QDeclarativeComponent component(&engine, source);
-    QScopedPointer<QObject> object(component.create());
-    QVERIFY(object);
-
-    QCOMPARE(evaluate<int>(object.data(), "groups.length"), 4);
-    QCOMPARE(evaluate<QString>(object.data(), "groups[0].name"), QString("items"));
-    QCOMPARE(evaluate<QString>(object.data(), "groups[1].name"), QString("persistedItems"));
-    QCOMPARE(evaluate<QString>(object.data(), "groups[2].name"), QString("visible"));
-    QCOMPARE(evaluate<QString>(object.data(), "groups[3].name"), QString("selected"));
-}
-
-void tst_qquickvisualdatamodel::onChanged_data()
-{
-    QTest::addColumn<QString>("expression");
-    QTest::addColumn<QStringList>("tests");
-
-    QTest::newRow("item appended")
-            << QString("listModel.append({\"number\": \"five\"})")
-            << (QStringList()
-                << "verify(vm.removed, [], [], [])"
-                << "verify(vm.inserted, [4], [1], [undefined])"
-                << "verify(vi.removed, [], [], [])"
-                << "verify(vi.inserted, [4], [1], [undefined])"
-                << "verify(si.removed, [], [], [])"
-                << "verify(si.inserted, [], [], [])");
-    QTest::newRow("item prepended")
-            << QString("listModel.insert(0, {\"number\": \"five\"})")
-            << (QStringList()
-                << "verify(vm.removed, [], [], [])"
-                << "verify(vm.inserted, [0], [1], [undefined])"
-                << "verify(vi.removed, [], [], [])"
-                << "verify(vi.inserted, [0], [1], [undefined])"
-                << "verify(si.removed, [], [], [])"
-                << "verify(si.inserted, [], [], [])");
-    QTest::newRow("item inserted")
-            << QString("listModel.insert(2, {\"number\": \"five\"})")
-            << (QStringList()
-                << "verify(vm.removed, [], [], [])"
-                << "verify(vm.inserted, [2], [1], [undefined])"
-                << "verify(vi.removed, [], [], [])"
-                << "verify(vi.inserted, [2], [1], [undefined])"
-                << "verify(si.removed, [], [], [])"
-                << "verify(si.inserted, [], [], [])");
-
-    QTest::newRow("item removed tail")
-            << QString("listModel.remove(3)")
-            << (QStringList()
-                << "verify(vm.removed, [3], [1], [undefined])"
-                << "verify(vm.inserted, [], [], [])"
-                << "verify(vi.removed, [3], [1], [undefined])"
-                << "verify(vi.inserted, [], [], [])"
-                << "verify(si.removed, [], [], [])"
-                << "verify(si.inserted, [], [], [])");
-    QTest::newRow("item removed head")
-            << QString("listModel.remove(0)")
-            << (QStringList()
-                << "verify(vm.removed, [0], [1], [undefined])"
-                << "verify(vm.inserted, [], [], [])"
-                << "verify(vi.removed, [0], [1], [undefined])"
-                << "verify(vi.inserted, [], [], [])"
-                << "verify(si.removed, [], [], [])"
-                << "verify(si.inserted, [], [], [])");
-    QTest::newRow("item removed middle")
-            << QString("listModel.remove(1)")
-            << (QStringList()
-                << "verify(vm.removed, [1], [1], [undefined])"
-                << "verify(vm.inserted, [], [], [])"
-                << "verify(vi.removed, [1], [1], [undefined])"
-                << "verify(vi.inserted, [], [], [])"
-                << "verify(si.removed, [], [], [])"
-                << "verify(si.inserted, [], [], [])");
-
-
-    QTest::newRow("item moved from tail")
-            << QString("listModel.move(3, 0, 1)")
-            << (QStringList()
-                << "verify(vm.removed, [3], [1], [vm.inserted[0].moveId])"
-                << "verify(vm.inserted, [0], [1], [vm.removed[0].moveId])"
-                << "verify(vi.removed, [3], [1], [vi.inserted[0].moveId])"
-                << "verify(vi.inserted, [0], [1], [vi.removed[0].moveId])"
-                << "verify(si.removed, [], [], [])"
-                << "verify(si.inserted, [], [], [])");
-    QTest::newRow("item moved from head")
-            << QString("listModel.move(0, 2, 2)")
-            << (QStringList()
-                << "verify(vm.removed, [0], [2], [vm.inserted[0].moveId])"
-                << "verify(vm.inserted, [2], [2], [vm.removed[0].moveId])"
-                << "verify(vi.removed, [0], [2], [vi.inserted[0].moveId])"
-                << "verify(vi.inserted, [2], [2], [vi.removed[0].moveId])"
-                << "verify(si.removed, [], [], [])"
-                << "verify(si.inserted, [], [], [])");
-
-    QTest::newRow("groups changed")
-            << QString("items.setGroups(1, 2, [\"items\", \"selected\"])")
-            << (QStringList()
-                << "verify(vm.inserted, [], [], [])"
-                << "verify(vm.removed, [], [], [])"
-                << "verify(vi.removed, [1], [2], [undefined])"
-                << "verify(vi.inserted, [], [], [])"
-                << "verify(si.removed, [], [], [])"
-                << "verify(si.inserted, [0], [2], [undefined])");
-
-    QTest::newRow("multiple removes")
-            << QString("{ vi.remove(1, 1); "
-                       "vi.removeGroups(0, 2, \"items\") }")
-            << (QStringList()
-                << "verify(vm.removed, [0, 1], [1, 1], [undefined, undefined])"
-                << "verify(vm.inserted, [], [], [])"
-                << "verify(vi.removed, [1], [1], [undefined])"
-                << "verify(vi.inserted, [], [], [])"
-                << "verify(si.removed, [], [], [])"
-                << "verify(si.inserted, [], [], [])");
-}
-
-void tst_qquickvisualdatamodel::onChanged()
-{
-    QFETCH(QString, expression);
-    QFETCH(QStringList, tests);
-
-    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("onChanged.qml")));
-    QScopedPointer<QObject> object(component.create());
-    QVERIFY(object);
-
-    evaluate<void>(object.data(), expression);
-
-    foreach (const QString &test, tests) {
-        bool passed = evaluate<bool>(object.data(), test);
-        if (!passed)
-            qWarning() << test;
-        QVERIFY(passed);
-    }
-}
-
-void tst_qquickvisualdatamodel::create()
-{
-    QQuickView view;
-
-    SingleRoleModel model;
-    model.list = QStringList()
-            << "one"
-            << "two"
-            << "three"
-            << "four"
-            << "five"
-            << "six"
-            << "seven"
-            << "eight"
-            << "nine"
-            << "ten"
-            << "eleven"
-            << "twelve"
-            << "thirteen"
-            << "fourteen"
-            << "fifteen"
-            << "sixteen"
-            << "seventeen"
-            << "eighteen"
-            << "nineteen"
-            << "twenty";
-
-    QDeclarativeContext *ctxt = view.rootContext();
-    ctxt->setContextProperty("myModel", &model);
-
-    view.setSource(QUrl::fromLocalFile(TESTDATA("create.qml")));
-
-    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
-    QVERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QVERIFY(contentItem != 0);
-
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
-    QVERIFY(visualModel);
-
-    QCOMPARE(listview->count(), 20);
-
-    QQuickItem *delegate;
-
-    // persistedItems.includeByDefault is true, so all items belong to persistedItems initially.
-    QVERIFY(delegate = findItem<QQuickItem>(contentItem, "delegate", 1));
-    QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
-
-    // changing include by default doesn't remove persistance.
-    evaluate<void>(visualModel, "persistedItems.includeByDefault = false");
-    QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
-
-    // removing from persistedItems does.
-    evaluate<void>(visualModel, "persistedItems.remove(0, 20)");
-    QCOMPARE(listview->count(), 20);
-    QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), false);
-
-    // Request an item instantiated by the view.
-    QVERIFY(delegate = qobject_cast<QQuickItem *>(evaluate<QObject *>(visualModel, "items.create(1)")));
-    QCOMPARE(delegate, findItem<QQuickItem>(contentItem, "delegate", 1));
-    QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
-    QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 1);
-
-    evaluate<void>(delegate, "VisualDataModel.inPersistedItems = false");
-    QCOMPARE(listview->count(), 20);
-    QCOMPARE(evaluate<bool>(delegate, "destroyed"), false);
-    QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), false);
-    QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 0);
-
-    // Request an item not instantiated by the view.
-    QVERIFY(!findItem<QQuickItem>(contentItem, "delegate", 15));
-    QVERIFY(delegate = qobject_cast<QQuickItem *>(evaluate<QObject *>(visualModel, "items.create(15)")));
-    QCOMPARE(delegate, findItem<QQuickItem>(contentItem, "delegate", 15));
-    QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
-    QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 1);
-
-    evaluate<void>(visualModel, "persistedItems.remove(0)");
-    QCOMPARE(evaluate<bool>(delegate, "destroyed"), true);
-    QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 0);
-
-    // Request an item not instantiated by the view, then scroll the view so it will request it.
-    QVERIFY(!findItem<QQuickItem>(contentItem, "delegate", 16));
-    QVERIFY(delegate = qobject_cast<QQuickItem *>(evaluate<QObject *>(visualModel, "items.create(16)")));
-    QCOMPARE(delegate, findItem<QQuickItem>(contentItem, "delegate", 16));
-    QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
-    QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 1);
-
-    evaluate<void>(listview, "positionViewAtIndex(19, ListView.End)");
-    QCOMPARE(listview->count(), 20);
-    evaluate<void>(delegate, "VisualDataModel.groups = [\"items\"]");
-    QCOMPARE(evaluate<bool>(delegate, "destroyed"), false);
-    QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), false);
-    QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 0);
-
-    // Request and release an item instantiated by the view, then scroll the view so it releases it.
-    QVERIFY(findItem<QQuickItem>(contentItem, "delegate", 17));
-    QVERIFY(delegate = qobject_cast<QQuickItem *>(evaluate<QObject *>(visualModel, "items.create(17)")));
-    QCOMPARE(delegate, findItem<QQuickItem>(contentItem, "delegate", 17));
-    QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
-    QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 1);
-
-    evaluate<void>(visualModel, "items.removeGroups(17, \"persistedItems\")");
-    QCOMPARE(evaluate<bool>(delegate, "destroyed"), false);
-    QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), false);
-    QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 0);
-    evaluate<void>(listview, "positionViewAtIndex(1, ListView.Beginning)");
-    QCOMPARE(listview->count(), 20);
-    QCOMPARE(evaluate<bool>(delegate, "destroyed"), true);
-
-    // Adding an item to the persistedItems group won't instantiate it, but if later requested by
-    // the view it will be persisted.
-    evaluate<void>(visualModel, "items.addGroups(18, \"persistedItems\")");
-    QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 1);
-    QVERIFY(!findItem<QQuickItem>(contentItem, "delegate", 18));
-    evaluate<void>(listview, "positionViewAtIndex(19, ListView.End)");
-    QCOMPARE(listview->count(), 20);
-    QVERIFY(delegate = findItem<QQuickItem>(contentItem, "delegate", 18));
-    QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
-    QCOMPARE(evaluate<bool>(delegate, "destroyed"), false);
-    evaluate<void>(listview, "positionViewAtIndex(1, ListView.Beginning)");
-    QCOMPARE(listview->count(), 20);
-    QCOMPARE(evaluate<bool>(delegate, "destroyed"), false);
-}
-
-
-void tst_qquickvisualdatamodel::incompleteModel()
-{
-    // VisualDataModel is first populated in componentComplete.  Verify various functions are
-    // harmlessly ignored until then.
-
-    QDeclarativeComponent component(&engine);
-    component.setData("import QtQuick 2.0\n VisualDataModel {}", QUrl::fromLocalFile(TESTDATA("")));
-
-    QScopedPointer<QObject> object(component.beginCreate(engine.rootContext()));
-
-    QQuickVisualDataModel *model = qobject_cast<QQuickVisualDataModel *>(object.data());
-    QVERIFY(model);
-
-    QSignalSpy itemsSpy(model->items(), SIGNAL(countChanged()));
-    QSignalSpy persistedItemsSpy(model->items(), SIGNAL(countChanged()));
-
-    evaluate<void>(model, "items.removeGroups(0, items.count, \"items\")");
-    QCOMPARE(itemsSpy.count(), 0);
-    QCOMPARE(persistedItemsSpy.count(), 0);
-
-    evaluate<void>(model, "items.setGroups(0, items.count, \"persistedItems\")");
-    QCOMPARE(itemsSpy.count(), 0);
-    QCOMPARE(persistedItemsSpy.count(), 0);
-
-    evaluate<void>(model, "items.addGroups(0, items.count, \"persistedItems\")");
-    QCOMPARE(itemsSpy.count(), 0);
-    QCOMPARE(persistedItemsSpy.count(), 0);
-
-    evaluate<void>(model, "items.remove(0, items.count)");
-    QCOMPARE(itemsSpy.count(), 0);
-    QCOMPARE(persistedItemsSpy.count(), 0);
-
-    evaluate<void>(model, "items.insert([ \"color\": \"blue\" ])");
-    QCOMPARE(itemsSpy.count(), 0);
-    QCOMPARE(persistedItemsSpy.count(), 0);
-
-    QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML VisualDataGroup: get: index out of range");
-    QVERIFY(evaluate<bool>(model, "items.get(0) === undefined"));
-
-    component.completeCreate();
-}
-
-template<typename T>
-T *tst_qquickvisualdatamodel::findItem(QQuickItem *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) {
-        QQuickItem *item = qobject_cast<QQuickItem*>(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), item, "index");
-                if (e.evaluate().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;
-}
-
-QTEST_MAIN(tst_qquickvisualdatamodel)
-
-#include "tst_qquickvisualdatamodel.moc"