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, 4379 deletions

diff --git a/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp b/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp
deleted file mode 100644
index 3b41600eb6..0000000000
--- a/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp
+++ /dev/null
@@ -1,4379 +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 <QtTest/QtTest>
-#include <QtWidgets/QStringListModel>
-#include <QtDeclarative/qquickview.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecontext.h>
-#include <QtDeclarative/qdeclarativeexpression.h>
-#include <QtDeclarative/qdeclarativeincubator.h>
-#include <QtDeclarative/private/qquickitem_p.h>
-#include <QtDeclarative/private/qquicklistview_p.h>
-#include <QtDeclarative/private/qquicktext_p.h>
-#include <QtDeclarative/private/qquickvisualitemmodel_p.h>
-#include <QtDeclarative/private/qdeclarativelistmodel_p.h>
-#include <QtDeclarative/private/qlistmodelinterface_p.h>
-#include <QtDeclarative/private/qdeclarativechangeset_p.h>
-#include "../shared/util.h"
-#include "incrementalmodel.h"
-#include <math.h>
-
-Q_DECLARE_METATYPE(Qt::LayoutDirection)
-Q_DECLARE_METATYPE(QQuickListView::Orientation)
-
-class tst_QQuickListView : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QQuickListView();
-
-private slots:
-    void initTestCase();
-    void cleanupTestCase();
-    // Test both QListModelInterface and QAbstractItemModel model types
-    void qListModelInterface_items();
-    void qAbstractItemModel_items();
-
-    void qListModelInterface_changed();
-    void qAbstractItemModel_changed();
-
-    void qListModelInterface_inserted();
-    void qListModelInterface_inserted_more();
-    void qListModelInterface_inserted_more_data();
-    void qAbstractItemModel_inserted();
-    void qAbstractItemModel_inserted_more();
-    void qAbstractItemModel_inserted_more_data();
-
-    void qListModelInterface_removed();
-    void qAbstractItemModel_removed();
-
-    void qListModelInterface_moved();
-    void qListModelInterface_moved_data();
-    void qAbstractItemModel_moved();
-    void qAbstractItemModel_moved_data();
-
-    void multipleChanges();
-    void multipleChanges_data();
-
-    void qListModelInterface_clear();
-    void qAbstractItemModel_clear();
-
-    void insertBeforeVisible();
-    void insertBeforeVisible_data();
-    void swapWithFirstItem();
-    void itemList();
-    void currentIndex_delayedItemCreation();
-    void currentIndex_delayedItemCreation_data();
-    void currentIndex();
-    void noCurrentIndex();
-    void enforceRange();
-    void enforceRange_withoutHighlight();
-    void spacing();
-    void sections();
-    void sectionsPositioning();
-    void sectionsDelegate();
-    void cacheBuffer();
-    void positionViewAtIndex();
-    void resetModel();
-    void propertyChanges();
-    void componentChanges();
-    void modelChanges();
-    void manualHighlight();
-    void header();
-    void header_data();
-    void header_delayItemCreation();
-    void footer();
-    void footer_data();
-    void headerFooter();
-    void resizeView();
-    void resizeViewAndRepaint();
-    void sizeLessThan1();
-    void QTBUG_14821();
-    void resizeDelegate();
-    void resizeFirstDelegate();
-    void QTBUG_16037();
-    void indexAt();
-    void incrementalModel();
-    void onAdd();
-    void onAdd_data();
-    void onRemove();
-    void onRemove_data();
-    void rightToLeft();
-    void test_mirroring();
-    void margins();
-    void creationContext();
-    void snapToItem_data();
-    void snapToItem();
-
-    void QTBUG_9791();
-    void QTBUG_11105();
-    void QTBUG_21742();
-
-    void asynchronous();
-
-private:
-    template <class T> void items();
-    template <class T> void changed();
-    template <class T> void inserted();
-    template <class T> void inserted_more();
-    template <class T> void removed(bool animated);
-    template <class T> void moved();
-    template <class T> void clear();
-    QQuickView *createView();
-    void flick(QQuickView *canvas, const QPoint &from, const QPoint &to, int duration);
-    QQuickItem *findVisibleChild(QQuickItem *parent, const QString &objectName);
-    template<typename T>
-    T *findItem(QQuickItem *parent, const QString &id, int index=-1);
-    template<typename T>
-    QList<T*> findItems(QQuickItem *parent, const QString &objectName);
-    void dumpTree(QQuickItem *parent, int depth = 0);
-
-    void inserted_more_data();
-    void moved_data();
-};
-
-void tst_QQuickListView::initTestCase()
-{
-}
-
-void tst_QQuickListView::cleanupTestCase()
-{
-
-}
-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;
-};
-
-template<typename T>
-void tst_qquicklistview_move(int from, int to, int n, T *items)
-{
-    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) {
-        items->move(from, to);
-    } else {
-        T replaced;
-        int i=0;
-        typename T::ConstIterator it=items->begin(); it += from+n;
-        for (; i<to-from; ++i,++it)
-            replaced.append(*it);
-        i=0;
-        it=items->begin(); it += from;
-        for (; i<n; ++i,++it)
-            replaced.append(*it);
-        typename T::ConstIterator f=replaced.begin();
-        typename T::Iterator t=items->begin(); t += from;
-        for (; f != replaced.end(); ++f, ++t)
-            *t = *f;
-    }
-}
-
-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 insertItems(int index, const QList<QPair<QString, QString> > &items) {
-        for (int i=0; i<items.count(); i++)
-            list.insert(index + i, QPair<QString,QString>(items[i].first, items[i].second));
-        emit itemsInserted(index, items.count());
-    }
-
-    void removeItem(int index) {
-        list.removeAt(index);
-        emit itemsRemoved(index, 1);
-    }
-
-    void removeItems(int index, int count) {
-        int c = count;
-        while (c--)
-            list.removeAt(index);
-        emit itemsRemoved(index, count);
-    }
-
-    void moveItem(int from, int to) {
-        list.move(from, to);
-        emit itemsMoved(from, to, 1);
-    }
-
-    void moveItems(int from, int to, int count) {
-        tst_qquicklistview_move(from, to, count, &list);
-        emit itemsMoved(from, to, count);
-    }
-
-    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 { Q_UNUSED(parent); 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 addItems(const QList<QPair<QString, QString> > &items) {
-        emit beginInsertRows(QModelIndex(), list.count(), list.count()+items.count()-1);
-        for (int i=0; i<items.count(); i++)
-            list.append(QPair<QString,QString>(items[i].first, items[i].second));
-        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 insertItems(int index, const QList<QPair<QString, QString> > &items) {
-        emit beginInsertRows(QModelIndex(), index, index+items.count()-1);
-        for (int i=0; i<items.count(); i++)
-            list.insert(index + i, QPair<QString,QString>(items[i].first, items[i].second));
-        emit endInsertRows();
-    }
-
-    void removeItem(int index) {
-        emit beginRemoveRows(QModelIndex(), index, index);
-        list.removeAt(index);
-        emit endRemoveRows();
-    }
-
-    void removeItems(int index, int count) {
-        emit beginRemoveRows(QModelIndex(), index, index+count-1);
-        while (count--)
-            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 moveItems(int from, int to, int count) {
-        emit beginMoveRows(QModelIndex(), from, from+count-1, QModelIndex(), to > from ? to+count : to);
-        tst_qquicklistview_move(from, to, count, &list);
-        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_QQuickListView::tst_QQuickListView()
-{
-}
-
-template <class T>
-void tst_QQuickListView::items()
-{
-    QQuickView *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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QTRY_VERIFY(testObject->error() == false);
-
-    QTRY_VERIFY(listview->highlightItem() != 0);
-    QTRY_COMPARE(listview->count(), model.count());
-    QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
-    QTRY_COMPARE(contentItem->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
-
-    // current item should be first item
-    QTRY_COMPARE(listview->currentItem(), findItem<QQuickItem>(contentItem, "wrapper", 0));
-
-    for (int i = 0; i < model.count(); ++i) {
-        QQuickText *name = findItem<QQuickText>(contentItem, "textName", i);
-        QTRY_VERIFY(name != 0);
-        QTRY_COMPARE(name->text(), model.name(i));
-        QQuickText *number = findItem<QQuickText>(contentItem, "textNumber", i);
-        QTRY_VERIFY(number != 0);
-        QTRY_COMPARE(number->text(), model.number(i));
-    }
-
-    // switch to other delegate
-    testObject->setAnimate(true);
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QTRY_VERIFY(testObject->error() == false);
-    QTRY_VERIFY(listview->currentItem());
-
-    // set invalid highlight
-    testObject->setInvalidHighlight(true);
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QTRY_VERIFY(testObject->error() == false);
-    QTRY_VERIFY(listview->currentItem());
-    QTRY_VERIFY(listview->highlightItem() == 0);
-
-    // back to normal highlight
-    testObject->setInvalidHighlight(false);
-    QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
-    QTRY_VERIFY(testObject->error() == false);
-    QTRY_VERIFY(listview->currentItem());
-    QTRY_VERIFY(listview->highlightItem() != 0);
-
-    // set an empty model and confirm that items are destroyed
-    T model2;
-    ctxt->setContextProperty("testModel", &model2);
-
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    QTRY_VERIFY(itemCount == 0);
-
-    QTRY_COMPARE(listview->highlightResizeSpeed(), 1000.0);
-    QTRY_COMPARE(listview->highlightMoveSpeed(), 1000.0);
-
-    delete canvas;
-    delete testObject;
-}
-
-
-template <class T>
-void tst_QQuickListView::changed()
-{
-    QQuickView *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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickFlickable *listview = findItem<QQuickFlickable>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    model.modifyItem(1, "Will", "9876");
-    QQuickText *name = findItem<QQuickText>(contentItem, "textName", 1);
-    QTRY_VERIFY(name != 0);
-    QTRY_COMPARE(name->text(), model.name(1));
-    QQuickText *number = findItem<QQuickText>(contentItem, "textNumber", 1);
-    QTRY_VERIFY(number != 0);
-    QTRY_COMPARE(number->text(), model.number(1));
-
-    delete canvas;
-    delete testObject;
-}
-
-template <class T>
-void tst_QQuickListView::inserted()
-{
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    model.insertItem(1, "Will", "9876");
-
-    QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
-    QTRY_COMPARE(contentItem->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
-
-    QQuickText *name = findItem<QQuickText>(contentItem, "textName", 1);
-    QTRY_VERIFY(name != 0);
-    QTRY_COMPARE(name->text(), model.name(1));
-    QQuickText *number = findItem<QQuickText>(contentItem, "textNumber", 1);
-    QTRY_VERIFY(number != 0);
-    QTRY_COMPARE(number->text(), model.number(1));
-
-    // Confirm items positioned correctly
-    for (int i = 0; i < model.count(); ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QTRY_COMPARE(item->y(), i*20.0);
-    }
-
-    model.insertItem(0, "Foo", "1111"); // zero index, and current item
-
-    QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
-    QTRY_COMPARE(contentItem->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
-
-    name = findItem<QQuickText>(contentItem, "textName", 0);
-    QTRY_VERIFY(name != 0);
-    QTRY_COMPARE(name->text(), model.name(0));
-    number = findItem<QQuickText>(contentItem, "textNumber", 0);
-    QTRY_VERIFY(number != 0);
-    QTRY_COMPARE(number->text(), model.number(0));
-
-    QTRY_COMPARE(listview->currentIndex(), 1);
-
-    // Confirm items positioned correctly
-    for (int i = 0; i < model.count(); ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QTRY_COMPARE(item->y(), i*20.0);
-    }
-
-    for (int i = model.count(); i < 30; ++i)
-        model.insertItem(i, "Hello", QString::number(i));
-
-    listview->setContentY(80);
-
-    // Insert item outside visible area
-    model.insertItem(1, "Hello", "1324");
-
-    QTRY_VERIFY(listview->contentY() == 80);
-
-    // Confirm items positioned correctly
-    for (int i = 5; i < 5+15; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), i*20.0 - 20.0);
-    }
-
-//    QTRY_COMPARE(listview->contentItemHeight(), model.count() * 20.0);
-
-    // QTBUG-19675
-    model.clear();
-    model.insertItem(0, "Hello", "1234");
-    QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
-
-    QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 0);
-    QVERIFY(item);
-    QCOMPARE(item->y(), 0.);
-    QVERIFY(listview->contentY() == 0);
-
-    delete canvas;
-    delete testObject;
-}
-
-template <class T>
-void tst_QQuickListView::inserted_more()
-{
-    QFETCH(qreal, contentY);
-    QFETCH(int, insertIndex);
-    QFETCH(int, insertCount);
-    QFETCH(qreal, itemsOffsetAfterMove);
-
-    QQuickText *name;
-    QQuickText *number;
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    listview->setContentY(contentY);
-
-    QList<QPair<QString, QString> > newData;
-    for (int i=0; i<insertCount; i++)
-        newData << qMakePair(QString("value %1").arg(i), QString::number(i));
-    model.insertItems(insertIndex, newData);
-    QTRY_COMPARE(listview->property("count").toInt(), model.count());
-
-    // check visibleItems.first() is in correct position
-    QQuickItem *item0 = findItem<QQuickItem>(contentItem, "wrapper", 0);
-    QVERIFY(item0);
-    QCOMPARE(item0->y(), itemsOffsetAfterMove);
-
-    QList<QQuickItem*> items = findItems<QQuickItem>(contentItem, "wrapper");
-    int firstVisibleIndex = -1;
-    for (int i=0; i<items.count(); i++) {
-        if (items[i]->y() >= contentY) {
-            QDeclarativeExpression e(qmlContext(items[i]), items[i], "index");
-            firstVisibleIndex = e.evaluate().toInt();
-            break;
-        }
-    }
-    QVERIFY2(firstVisibleIndex >= 0, QTest::toString(firstVisibleIndex));
-
-    // Confirm items positioned correctly and indexes correct
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = firstVisibleIndex; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QVERIFY2(item, QTest::toString(QString("Item %1 not found").arg(i)));
-        QTRY_COMPARE(item->y(), i*20.0 + itemsOffsetAfterMove);
-        name = findItem<QQuickText>(contentItem, "textName", i);
-        QVERIFY(name != 0);
-        QTRY_COMPARE(name->text(), model.name(i));
-        number = findItem<QQuickText>(contentItem, "textNumber", i);
-        QVERIFY(number != 0);
-        QTRY_COMPARE(number->text(), model.number(i));
-    }
-
-    delete canvas;
-    delete testObject;
-}
-
-void tst_QQuickListView::inserted_more_data()
-{
-    QTest::addColumn<qreal>("contentY");
-    QTest::addColumn<int>("insertIndex");
-    QTest::addColumn<int>("insertCount");
-    QTest::addColumn<qreal>("itemsOffsetAfterMove");
-
-    QTest::newRow("add 1, before visible items")
-            << 80.0     // show 4-19
-            << 3 << 1
-            << -20.0;   // insert above first visible i.e. 0 is at -20, first visible should not move
-
-    QTest::newRow("add multiple, before visible")
-            << 80.0     // show 4-19
-            << 3 << 3
-            << -20.0 * 3;   // again first visible should not move
-
-    QTest::newRow("add 1, at start of visible, content at start")
-            << 0.0
-            << 0 << 1
-            << 0.0;
-
-    QTest::newRow("add multiple, start of visible, content at start")
-            << 0.0
-            << 0 << 3
-            << 0.0;
-
-    QTest::newRow("add 1, at start of visible, content not at start")
-            << 80.0     // show 4-19
-            << 4 << 1
-            << 0.0;
-
-    QTest::newRow("add multiple, at start of visible, content not at start")
-            << 80.0     // show 4-19
-            << 4 << 3
-            << 0.0;
-
-
-    QTest::newRow("add 1, at end of visible, content at start")
-            << 0.0
-            << 15 << 1
-            << 0.0;
-
-    QTest::newRow("add 1, at end of visible, content at start")
-            << 0.0
-            << 15 << 3
-            << 0.0;
-
-    QTest::newRow("add 1, at end of visible, content not at start")
-            << 80.0     // show 4-19
-            << 19 << 1
-            << 0.0;
-
-    QTest::newRow("add multiple, at end of visible, content not at start")
-            << 80.0     // show 4-19
-            << 19 << 3
-            << 0.0;
-
-
-    QTest::newRow("add 1, after visible, content at start")
-            << 0.0
-            << 16 << 1
-            << 0.0;
-
-    QTest::newRow("add 1, after visible, content at start")
-            << 0.0
-            << 16 << 3
-            << 0.0;
-
-    QTest::newRow("add 1, after visible, content not at start")
-            << 80.0     // show 4-19
-            << 20 << 1
-            << 0.0;
-
-    QTest::newRow("add multiple, after visible, content not at start")
-            << 80.0     // show 4-19
-            << 20 << 3
-            << 0.0;
-}
-
-void tst_QQuickListView::insertBeforeVisible()
-{
-    QFETCH(int, insertIndex);
-    QFETCH(int, insertCount);
-    QFETCH(int, cacheBuffer);
-
-    QQuickText *name;
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    listview->setCacheBuffer(cacheBuffer);
-
-    // trigger a refill (not just setting contentY) so that the visibleItems grid is updated
-    int firstVisibleIndex = 20;     // move to an index where the top item is not visible
-    listview->setContentY(firstVisibleIndex * 20.0);
-    listview->setCurrentIndex(firstVisibleIndex);
-    qApp->processEvents();
-    QTRY_COMPARE(listview->currentIndex(), firstVisibleIndex);
-    QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", firstVisibleIndex);
-    QVERIFY(item);
-    QCOMPARE(item->y(), listview->contentY());
-
-    QList<QPair<QString, QString> > newData;
-    for (int i=0; i<insertCount; i++)
-        newData << qMakePair(QString("value %1").arg(i), QString::number(i));
-    model.insertItems(insertIndex, newData);
-    QTRY_COMPARE(listview->property("count").toInt(), model.count());
-
-    // now, moving to the top of the view should position the inserted items correctly
-    int itemsOffsetAfterMove = -(insertCount * 20);
-    listview->setCurrentIndex(0);
-    QTRY_COMPARE(listview->currentIndex(), 0);
-    QTRY_COMPARE(listview->contentY(), 0.0 + itemsOffsetAfterMove);
-
-    // Confirm items positioned correctly and indexes correct
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QVERIFY2(item, QTest::toString(QString("Item %1 not found").arg(i)));
-        QTRY_COMPARE(item->y(), i*20.0 + itemsOffsetAfterMove);
-        name = findItem<QQuickText>(contentItem, "textName", i);
-        QVERIFY(name != 0);
-        QTRY_COMPARE(name->text(), model.name(i));
-    }
-
-    delete canvas;
-    delete testObject;
-}
-
-void tst_QQuickListView::insertBeforeVisible_data()
-{
-    QTest::addColumn<int>("insertIndex");
-    QTest::addColumn<int>("insertCount");
-    QTest::addColumn<int>("cacheBuffer");
-
-    QTest::newRow("insert 1 at 0, 0 buffer") << 0 << 1 << 0;
-    QTest::newRow("insert 1 at 0, 100 buffer") << 0 << 1 << 100;
-    QTest::newRow("insert 1 at 0, 500 buffer") << 0 << 1 << 500;
-
-    QTest::newRow("insert 1 at 1, 0 buffer") << 1 << 1 << 0;
-    QTest::newRow("insert 1 at 1, 100 buffer") << 1 << 1 << 100;
-    QTest::newRow("insert 1 at 1, 500 buffer") << 1 << 1 << 500;
-
-    QTest::newRow("insert multiple at 0, 0 buffer") << 0 << 3 << 0;
-    QTest::newRow("insert multiple at 0, 100 buffer") << 0 << 3 << 100;
-    QTest::newRow("insert multiple at 0, 500 buffer") << 0 << 3 << 500;
-
-    QTest::newRow("insert multiple at 1, 0 buffer") << 1 << 3 << 0;
-    QTest::newRow("insert multiple at 1, 100 buffer") << 1 << 3 << 100;
-    QTest::newRow("insert multiple at 1, 500 buffer") << 1 << 3 << 500;
-}
-
-template <class T>
-void tst_QQuickListView::removed(bool /* animated */)
-{
-    QQuickView *canvas = createView();
-
-    T model;
-    for (int i = 0; i < 50; 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(TESTDATA("listviewtest.qml")));
-    canvas->show();
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    model.removeItem(1);
-    QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
-
-    QQuickText *name = findItem<QQuickText>(contentItem, "textName", 1);
-    QTRY_VERIFY(name != 0);
-    QTRY_COMPARE(name->text(), model.name(1));
-    QQuickText *number = findItem<QQuickText>(contentItem, "textNumber", 1);
-    QTRY_VERIFY(number != 0);
-    QTRY_COMPARE(number->text(), model.number(1));
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*20);
-    }
-
-    // Remove first item (which is the current item);
-    model.removeItem(0);  // post: top item starts at 20
-    QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
-
-    name = findItem<QQuickText>(contentItem, "textName", 0);
-    QTRY_VERIFY(name != 0);
-    QTRY_COMPARE(name->text(), model.name(0));
-    number = findItem<QQuickText>(contentItem, "textNumber", 0);
-    QTRY_VERIFY(number != 0);
-    QTRY_COMPARE(number->text(), model.number(0));
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(),i*20.0 + 20.0);
-    }
-
-    // Remove items not visible
-    model.removeItem(18);
-    QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(),i*20.0+20.0);
-    }
-
-    // Remove items before visible
-    listview->setContentY(80);
-    listview->setCurrentIndex(10);
-
-    model.removeItem(1); // post: top item will be at 40
-    QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
-
-    // Confirm items positioned correctly
-    for (int i = 2; i < 18; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(),40+i*20.0);
-    }
-
-    // Remove current index
-    QTRY_VERIFY(listview->currentIndex() == 9);
-    QQuickItem *oldCurrent = listview->currentItem();
-    model.removeItem(9);
-
-    QTRY_COMPARE(listview->currentIndex(), 9);
-    QTRY_VERIFY(listview->currentItem() != oldCurrent);
-
-    listview->setContentY(40); // That's the top now
-    // let transitions settle.
-    QTest::qWait(300);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(),40+i*20.0);
-    }
-
-    // remove current item beyond visible items.
-    listview->setCurrentIndex(20);
-    listview->setContentY(40);
-    model.removeItem(20);
-
-    QTRY_COMPARE(listview->currentIndex(), 20);
-    QTRY_VERIFY(listview->currentItem() != 0);
-
-    // remove item before current, but visible
-    listview->setCurrentIndex(8);
-    oldCurrent = listview->currentItem();
-    model.removeItem(6);
-
-    QTRY_COMPARE(listview->currentIndex(), 7);
-    QTRY_VERIFY(listview->currentItem() == oldCurrent);
-
-    listview->setContentY(80);
-    QTest::qWait(300);
-
-    // remove all visible items
-    model.removeItems(1, 18);
-    QTRY_COMPARE(listview->count() , model.count());
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i+1);
-        if (!item) qWarning() << "Item" << i+1 << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(),80+i*20.0);
-    }
-
-    model.removeItems(1, 17);
-    QTRY_COMPARE(listview->count() , model.count());
-
-    model.removeItems(2, 1);
-    QTRY_COMPARE(listview->count() , model.count());
-
-    model.addItem("New", "1");
-    QTRY_COMPARE(listview->count() , model.count());
-
-    QTRY_VERIFY(name = findItem<QQuickText>(contentItem, "textName", model.count()-1));
-    QCOMPARE(name->text(), QString("New"));
-
-    // Add some more items so that we don't run out
-    model.clear();
-    for (int i = 0; i < 50; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    // QTBUG-QTBUG-20575
-    listview->setCurrentIndex(0);
-    listview->setContentY(30);
-    model.removeItem(0);
-    QTRY_VERIFY(name = findItem<QQuickText>(contentItem, "textName", 0));
-
-    // QTBUG-19198 move to end and remove all visible items one at a time.
-    listview->positionViewAtEnd();
-    for (int i = 0; i < 18; ++i)
-        model.removeItems(model.count() - 1, 1);
-    QTRY_VERIFY(findItems<QQuickItem>(contentItem, "wrapper").count() > 16);
-
-    delete canvas;
-    delete testObject;
-}
-
-template <class T>
-void tst_QQuickListView::clear()
-{
-    QQuickView *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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    model.clear();
-
-    QTRY_VERIFY(listview->count() == 0);
-    QTRY_VERIFY(listview->currentItem() == 0);
-    QTRY_VERIFY(listview->contentY() == 0);
-    QVERIFY(listview->currentIndex() == -1);
-
-    // confirm sanity when adding an item to cleared list
-    model.addItem("New", "1");
-    QTRY_VERIFY(listview->count() == 1);
-    QVERIFY(listview->currentItem() != 0);
-    QVERIFY(listview->currentIndex() == 0);
-
-    delete canvas;
-    delete testObject;
-}
-
-template <class T>
-void tst_QQuickListView::moved()
-{
-    QFETCH(qreal, contentY);
-    QFETCH(int, from);
-    QFETCH(int, to);
-    QFETCH(int, count);
-    QFETCH(qreal, itemsOffsetAfterMove);
-
-    QQuickText *name;
-    QQuickText *number;
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QQuickItem *currentItem = listview->currentItem();
-    QTRY_VERIFY(currentItem != 0);
-
-    listview->setContentY(contentY);
-    model.moveItems(from, to, count);
-
-    // wait for items to move
-    QTest::qWait(100);
-
-    QList<QQuickItem*> items = findItems<QQuickItem>(contentItem, "wrapper");
-    int firstVisibleIndex = -1;
-    for (int i=0; i<items.count(); i++) {
-        if (items[i]->y() >= contentY) {
-            QDeclarativeExpression e(qmlContext(items[i]), items[i], "index");
-            firstVisibleIndex = e.evaluate().toInt();
-            break;
-        }
-    }
-    QVERIFY2(firstVisibleIndex >= 0, QTest::toString(firstVisibleIndex));
-
-    // Confirm items positioned correctly and indexes correct
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = firstVisibleIndex; i < model.count() && i < itemCount; ++i) {
-        if (i >= firstVisibleIndex + 16)    // index has moved out of view
-            continue;
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QVERIFY2(item, QTest::toString(QString("Item %1 not found").arg(i)));
-        QTRY_COMPARE(item->y(), i*20.0 + itemsOffsetAfterMove);
-        name = findItem<QQuickText>(contentItem, "textName", i);
-        QVERIFY(name != 0);
-        QTRY_COMPARE(name->text(), model.name(i));
-        number = findItem<QQuickText>(contentItem, "textNumber", i);
-        QVERIFY(number != 0);
-        QTRY_COMPARE(number->text(), model.number(i));
-
-        // current index should have been updated
-        if (item == currentItem)
-            QTRY_COMPARE(listview->currentIndex(), i);
-    }
-
-    delete canvas;
-    delete testObject;
-}
-
-void tst_QQuickListView::moved_data()
-{
-    QTest::addColumn<qreal>("contentY");
-    QTest::addColumn<int>("from");
-    QTest::addColumn<int>("to");
-    QTest::addColumn<int>("count");
-    QTest::addColumn<qreal>("itemsOffsetAfterMove");
-
-    // model starts with 30 items, each 20px high, in area 320px high
-    // 16 items should be visible at a time
-    // itemsOffsetAfterMove should be > 0 whenever items above the visible pos have moved
-
-    QTest::newRow("move 1 forwards, within visible items")
-            << 0.0
-            << 1 << 4 << 1
-            << 0.0;
-
-    QTest::newRow("move 1 forwards, from non-visible -> visible")
-            << 80.0     // show 4-19
-            << 1 << 18 << 1
-            << 20.0;    // removed 1 item above the first visible, so item 0 should drop down by 1 to minimize movement
-
-    QTest::newRow("move 1 forwards, from non-visible -> visible (move first item)")
-            << 80.0     // show 4-19
-            << 0 << 4 << 1
-            << 20.0;    // first item has moved to below item4, everything drops down by size of 1 item
-
-    QTest::newRow("move 1 forwards, from visible -> non-visible")
-            << 0.0
-            << 1 << 16 << 1
-            << 0.0;
-
-    QTest::newRow("move 1 forwards, from visible -> non-visible (move first item)")
-            << 0.0
-            << 0 << 16 << 1
-            << 0.0;
-
-
-    QTest::newRow("move 1 backwards, within visible items")
-            << 0.0
-            << 4 << 1 << 1
-            << 0.0;
-
-    QTest::newRow("move 1 backwards, within visible items (to first index)")
-            << 0.0
-            << 4 << 0 << 1
-            << 0.0;
-
-    QTest::newRow("move 1 backwards, from non-visible -> visible")
-            << 0.0
-            << 20 << 4 << 1
-            << 0.0;
-
-    QTest::newRow("move 1 backwards, from non-visible -> visible (move last item)")
-            << 0.0
-            << 29 << 15 << 1
-            << 0.0;
-
-    QTest::newRow("move 1 backwards, from visible -> non-visible")
-            << 80.0     // show 4-19
-            << 16 << 1 << 1
-            << -20.0;   // to minimize movement, item 0 moves to -20, and other items do not move
-
-    QTest::newRow("move 1 backwards, from visible -> non-visible (move first item)")
-            << 80.0     // show 4-19
-            << 16 << 0 << 1
-            << -20.0;   // to minimize movement, item 16 (now at 0) moves to -20, and other items do not move
-
-
-    QTest::newRow("move multiple forwards, within visible items")
-            << 0.0
-            << 0 << 5 << 3
-            << 0.0;
-
-    QTest::newRow("move multiple forwards, before visible items")
-            << 140.0     // show 7-22
-            << 4 << 5 << 3      // 4,5,6 move to below 7
-            << 20.0 * 3;      // 4,5,6 moved down
-
-    QTest::newRow("move multiple forwards, from non-visible -> visible")
-            << 80.0     // show 4-19
-            << 1 << 5 << 3
-            << 20.0 * 3;    // moving 3 from above the content y should adjust y positions accordingly
-
-    QTest::newRow("move multiple forwards, from non-visible -> visible (move first item)")
-            << 80.0     // show 4-19
-            << 0 << 5 << 3
-            << 20.0 * 3;        // moving 3 from above the content y should adjust y positions accordingly
-
-    QTest::newRow("move multiple forwards, from visible -> non-visible")
-            << 0.0
-            << 1 << 16 << 3
-            << 0.0;
-
-    QTest::newRow("move multiple forwards, from visible -> non-visible (move first item)")
-            << 0.0
-            << 0 << 16 << 3
-            << 0.0;
-
-
-    QTest::newRow("move multiple backwards, within visible items")
-            << 0.0
-            << 4 << 1 << 3
-            << 0.0;
-
-    QTest::newRow("move multiple backwards, within visible items (move first item)")
-            << 0.0
-            << 10 << 0 << 3
-            << 0.0;
-
-    QTest::newRow("move multiple backwards, from non-visible -> visible")
-            << 0.0
-            << 20 << 4 << 3
-            << 0.0;
-
-    QTest::newRow("move multiple backwards, from non-visible -> visible (move last item)")
-            << 0.0
-            << 27 << 10 << 3
-            << 0.0;
-
-    QTest::newRow("move multiple backwards, from visible -> non-visible")
-            << 80.0     // show 4-19
-            << 16 << 1 << 3
-            << -20.0 * 3;   // to minimize movement, 0 moves by -60, and other items do not move
-
-    QTest::newRow("move multiple backwards, from visible -> non-visible (move first item)")
-            << 80.0     // show 4-19
-            << 16 << 0 << 3
-            << -20.0 * 3;   // to minimize movement, 16,17,18 move to above item 0, and other items do not move
-}
-
-
-struct ListChange {
-    enum { Inserted, Removed, Moved, SetCurrent } type;
-    int index;
-    int count;
-    int to;     // Move
-
-    static ListChange insert(int index, int count = 1) { ListChange c = { Inserted, index, count, -1 }; return c; }
-    static ListChange remove(int index, int count = 1) { ListChange c = { Removed, index, count, -1 }; return c; }
-    static ListChange move(int index, int to, int count) { ListChange c = { Moved, index, count, to }; return c; }
-    static ListChange setCurrent(int index) { ListChange c = { SetCurrent, index, -1, -1 }; return c; }
-};
-Q_DECLARE_METATYPE(QList<ListChange>)
-
-void tst_QQuickListView::multipleChanges()
-{
-    QFETCH(int, startCount);
-    QFETCH(QList<ListChange>, changes);
-    QFETCH(int, newCount);
-    QFETCH(int, newCurrentIndex);
-
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    TestModel model;
-    for (int i = 0; i < startCount; 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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    for (int i=0; i<changes.count(); i++) {
-        switch (changes[i].type) {
-            case ListChange::Inserted:
-            {
-                QList<QPair<QString, QString> > items;
-                for (int j=changes[i].index; j<changes[i].index + changes[i].count; ++j)
-                    items << qMakePair(QString("new item " + j), QString::number(j));
-                model.insertItems(changes[i].index, items);
-                break;
-            }
-            case ListChange::Removed:
-                model.removeItems(changes[i].index, changes[i].count);
-                break;
-            case ListChange::Moved:
-                model.moveItems(changes[i].index, changes[i].to, changes[i].count);
-                break;
-            case ListChange::SetCurrent:
-                listview->setCurrentIndex(changes[i].index);
-                break;
-        }
-    }
-
-    QTRY_COMPARE(listview->count(), newCount);
-    QCOMPARE(listview->count(), model.count());
-    QTRY_COMPARE(listview->currentIndex(), newCurrentIndex);
-
-    QQuickText *name;
-    QQuickText *number;
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i=0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QVERIFY2(item, QTest::toString(QString("Item %1 not found").arg(i)));
-        name = findItem<QQuickText>(contentItem, "textName", i);
-        QVERIFY(name != 0);
-        QTRY_COMPARE(name->text(), model.name(i));
-        number = findItem<QQuickText>(contentItem, "textNumber", i);
-        QVERIFY(number != 0);
-        QTRY_COMPARE(number->text(), model.number(i));
-    }
-
-    delete testObject;
-    delete canvas;
-}
-
-void tst_QQuickListView::multipleChanges_data()
-{
-    QTest::addColumn<int>("startCount");
-    QTest::addColumn<QList<ListChange> >("changes");
-    QTest::addColumn<int>("newCount");
-    QTest::addColumn<int>("newCurrentIndex");
-
-    QList<ListChange> changes;
-
-    for (int i=1; i<30; i++)
-        changes << ListChange::remove(0);
-    QTest::newRow("remove all but 1, first->last") << 30 << changes << 1 << 0;
-
-    changes << ListChange::remove(0);
-    QTest::newRow("remove all") << 30 << changes << 0 << -1;
-
-    changes.clear();
-    changes << ListChange::setCurrent(29);
-    for (int i=29; i>0; i--)
-        changes << ListChange::remove(i);
-    QTest::newRow("remove last (current) -> first") << 30 << changes << 1 << 0;
-
-    QTest::newRow("remove then insert at 0") << 10 << (QList<ListChange>()
-            << ListChange::remove(0, 1)
-            << ListChange::insert(0, 1)
-            ) << 10 << 1;
-
-    QTest::newRow("remove then insert at non-zero index") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(2)
-            << ListChange::remove(2, 1)
-            << ListChange::insert(2, 1)
-            ) << 10 << 3;
-
-    QTest::newRow("remove current then insert below it") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(1)
-            << ListChange::remove(1, 3)
-            << ListChange::insert(2, 2)
-            ) << 9 << 1;
-
-    QTest::newRow("remove current index then move it down") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(2)
-            << ListChange::remove(1, 3)
-            << ListChange::move(1, 5, 1)
-            ) << 7 << 5;
-
-    QTest::newRow("remove current index then move it up") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(5)
-            << ListChange::remove(4, 3)
-            << ListChange::move(4, 1, 1)
-            ) << 7 << 1;
-
-
-    QTest::newRow("insert multiple times") << 0 << (QList<ListChange>()
-            << ListChange::insert(0, 2)
-            << ListChange::insert(0, 4)
-            << ListChange::insert(0, 6)
-            ) << 12 << 10;
-
-    QTest::newRow("insert multiple times with current index changes") << 0 << (QList<ListChange>()
-            << ListChange::insert(0, 2)
-            << ListChange::insert(0, 4)
-            << ListChange::insert(0, 6)
-            << ListChange::setCurrent(3)
-            << ListChange::insert(3, 2)
-            ) << 14 << 5;
-
-    QTest::newRow("insert and remove all") << 0 << (QList<ListChange>()
-            << ListChange::insert(0, 30)
-            << ListChange::remove(0, 30)
-            ) << 0 << -1;
-
-    QTest::newRow("insert and remove current") << 30 << (QList<ListChange>()
-            << ListChange::insert(1)
-            << ListChange::setCurrent(1)
-            << ListChange::remove(1)
-            ) << 30 << 1;
-
-    QTest::newRow("insert before 0, then remove cross section of new and old items") << 10 << (QList<ListChange>()
-            << ListChange::insert(0, 10)
-            << ListChange::remove(5, 10)
-            ) << 10 << 5;
-
-    QTest::newRow("insert multiple, then move new items to end") << 10 << (QList<ListChange>()
-            << ListChange::insert(0, 3)
-            << ListChange::move(0, 10, 3)
-            ) << 13 << 0;
-
-    QTest::newRow("insert multiple, then move new and some old items to end") << 10 << (QList<ListChange>()
-            << ListChange::insert(0, 3)
-            << ListChange::move(0, 8, 5)
-            ) << 13 << 11;
-
-    QTest::newRow("insert multiple at end, then move new and some old items to start") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(9)
-            << ListChange::insert(10, 3)
-            << ListChange::move(8, 0, 5)
-            ) << 13 << 1;
-
-
-    QTest::newRow("move back and forth to same index") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(1)
-            << ListChange::move(1, 2, 2)
-            << ListChange::move(2, 1, 2)
-            ) << 10 << 1;
-
-    QTest::newRow("move forwards then back") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(2)
-            << ListChange::move(1, 2, 3)
-            << ListChange::move(3, 0, 5)
-            ) << 10 << 0;
-
-    QTest::newRow("move current, then remove it") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(5)
-            << ListChange::move(5, 0, 1)
-            << ListChange::remove(0)
-            ) << 9 << 0;
-
-    QTest::newRow("move current, then insert before it") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(5)
-            << ListChange::move(5, 0, 1)
-            << ListChange::insert(0)
-            ) << 11 << 1;
-
-    QTest::newRow("move multiple, then remove them") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(1)
-            << ListChange::move(5, 1, 3)
-            << ListChange::remove(1, 3)
-            ) << 7 << 1;
-
-    QTest::newRow("move multiple, then insert before them") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(5)
-            << ListChange::move(5, 1, 3)
-            << ListChange::insert(1, 5)
-            ) << 15 << 6;
-
-    QTest::newRow("move multiple, then insert after them") << 10 << (QList<ListChange>()
-            << ListChange::setCurrent(3)
-            << ListChange::move(0, 1, 2)
-            << ListChange::insert(3, 5)
-            ) << 15 << 8;
-
-
-    QTest::newRow("clear current") << 0 << (QList<ListChange>()
-            << ListChange::insert(0, 5)
-            << ListChange::setCurrent(-1)
-            << ListChange::remove(0, 5)
-            << ListChange::insert(0, 5)
-            ) << 5 << -1;
-}
-
-void tst_QQuickListView::swapWithFirstItem()
-{
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    // ensure content position is stable
-    listview->setContentY(0);
-    model.moveItem(1, 0);
-    QTRY_VERIFY(listview->contentY() == 0);
-
-    delete testObject;
-    delete canvas;
-}
-
-void tst_QQuickListView::enforceRange()
-{
-    QQuickView *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(TESTDATA("listview-enforcerange.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QTRY_COMPARE(listview->preferredHighlightBegin(), 100.0);
-    QTRY_COMPARE(listview->preferredHighlightEnd(), 100.0);
-    QTRY_COMPARE(listview->highlightRangeMode(), QQuickListView::StrictlyEnforceRange);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // view should be positioned at the top of the range.
-    QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 0);
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(listview->contentY(), -100.0);
-
-    QQuickText *name = findItem<QQuickText>(contentItem, "textName", 0);
-    QTRY_VERIFY(name != 0);
-    QTRY_COMPARE(name->text(), model.name(0));
-    QQuickText *number = findItem<QQuickText>(contentItem, "textNumber", 0);
-    QTRY_VERIFY(number != 0);
-    QTRY_COMPARE(number->text(), model.number(0));
-
-    // Check currentIndex is updated when contentItem moves
-    listview->setContentY(20);
-
-    QTRY_COMPARE(listview->currentIndex(), 6);
-
-    // change model
-    TestModel model2;
-    for (int i = 0; i < 5; i++)
-        model2.addItem("Item" + QString::number(i), "");
-
-    ctxt->setContextProperty("testModel", &model2);
-    QCOMPARE(listview->count(), 5);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::enforceRange_withoutHighlight()
-{
-    // QTBUG-20287
-    // If no highlight is set but StrictlyEnforceRange is used, the content should still move
-    // to the correct position (i.e. to the next/previous item, not next/previous section)
-    // when moving up/down via incrementCurrentIndex() and decrementCurrentIndex()
-
-    QQuickView *canvas = createView();
-    canvas->show();
-    QTest::qWait(200);
-
-    TestModel model;
-    model.addItem("Item 0", "a");
-    model.addItem("Item 1", "b");
-    model.addItem("Item 2", "b");
-    model.addItem("Item 3", "c");
-
-    QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("listview-enforcerange-nohighlight.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    qreal expectedPos = -100.0;
-
-    expectedPos += 10.0;    // scroll past 1st section's delegate (10px height)
-    QTRY_COMPARE(listview->contentY(), expectedPos);
-
-    expectedPos += 20 + 10;     // scroll past 1st section and section delegate of 2nd section
-    QTest::keyClick(canvas, Qt::Key_Down);
-
-    QTRY_COMPARE(listview->contentY(), expectedPos);
-
-    expectedPos += 20;     // scroll past 1st item of 2nd section
-    QTest::keyClick(canvas, Qt::Key_Down);
-    QTRY_COMPARE(listview->contentY(), expectedPos);
-
-    expectedPos += 20 + 10;     // scroll past 2nd item of 2nd section and section delegate of 3rd section
-    QTest::keyClick(canvas, Qt::Key_Down);
-    QTRY_COMPARE(listview->contentY(), expectedPos);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::spacing()
-{
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*20);
-    }
-
-    listview->setSpacing(10);
-    QTRY_VERIFY(listview->spacing() == 10);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*30);
-    }
-
-    listview->setSpacing(0);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), i*20.0);
-    }
-
-    delete canvas;
-    delete testObject;
-}
-
-void tst_QQuickListView::sections()
-{
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    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(TESTDATA("listview-sections.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), qreal(i*20 + ((i+4)/5) * 20));
-        QQuickText *next = findItem<QQuickText>(item, "nextSection");
-        QCOMPARE(next->text().toInt(), (i+1)/5);
-    }
-
-    QSignalSpy currentSectionChangedSpy(listview, SIGNAL(currentSectionChanged()));
-
-    // Remove section boundary
-    model.removeItem(5);
-    QTRY_COMPARE(listview->count(), model.count());
-
-    // New section header created
-    QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 5);
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(item->height(), 40.0);
-
-    model.insertItem(3, "New Item", "0");
-    QTRY_COMPARE(listview->count(), model.count());
-
-    // Section header moved
-    item = findItem<QQuickItem>(contentItem, "wrapper", 5);
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(item->height(), 20.0);
-
-    item = findItem<QQuickItem>(contentItem, "wrapper", 6);
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(item->height(), 40.0);
-
-    // insert item which will become a section header
-    model.insertItem(6, "Replace header", "1");
-    QTRY_COMPARE(listview->count(), model.count());
-
-    item = findItem<QQuickItem>(contentItem, "wrapper", 6);
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(item->height(), 40.0);
-
-    item = findItem<QQuickItem>(contentItem, "wrapper", 7);
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(item->height(), 20.0);
-
-    QTRY_COMPARE(listview->currentSection(), QString("0"));
-
-    listview->setContentY(140);
-    QTRY_COMPARE(listview->currentSection(), QString("1"));
-
-    QTRY_COMPARE(currentSectionChangedSpy.count(), 1);
-
-    listview->setContentY(20);
-    QTRY_COMPARE(listview->currentSection(), QString("0"));
-
-    QTRY_COMPARE(currentSectionChangedSpy.count(), 2);
-
-    item = findItem<QQuickItem>(contentItem, "wrapper", 1);
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(item->height(), 20.0);
-
-    // check that headers change when item changes
-    listview->setContentY(0);
-    model.modifyItem(0, "changed", "2");
-    QTest::qWait(300);
-
-    item = findItem<QQuickItem>(contentItem, "wrapper", 1);
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(item->height(), 40.0);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::sectionsDelegate()
-{
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    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(TESTDATA("listview-sections_delegate.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), qreal(i*20 + ((i+5)/5) * 20));
-        QQuickText *next = findItem<QQuickText>(item, "nextSection");
-        QCOMPARE(next->text().toInt(), (i+1)/5);
-    }
-
-    for (int i = 0; i < 3; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "sect_" + QString::number(i));
-        QVERIFY(item);
-        QTRY_COMPARE(item->y(), qreal(i*20*6));
-    }
-
-    model.modifyItem(0, "One", "aaa");
-    model.modifyItem(1, "Two", "aaa");
-    model.modifyItem(2, "Three", "aaa");
-    model.modifyItem(3, "Four", "aaa");
-    model.modifyItem(4, "Five", "aaa");
-    QTest::qWait(300);
-
-    for (int i = 0; i < 3; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem,
-                "sect_" + (i == 0 ? QString("aaa") : QString::number(i)));
-        QVERIFY(item);
-        QTRY_COMPARE(item->y(), qreal(i*20*6));
-    }
-
-    // remove section boundary
-    model.removeItem(5);
-    QTRY_COMPARE(listview->count(), model.count());
-    for (int i = 0; i < 3; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem,
-                "sect_" + (i == 0 ? QString("aaa") : QString::number(i)));
-        QVERIFY(item);
-    }
-
-    // QTBUG-17606
-    QList<QQuickItem*> items = findItems<QQuickItem>(contentItem, "sect_1");
-    QCOMPARE(items.count(), 1);
-
-    // QTBUG-17759
-    model.modifyItem(0, "One", "aaa");
-    model.modifyItem(1, "One", "aaa");
-    model.modifyItem(2, "One", "aaa");
-    model.modifyItem(3, "Four", "aaa");
-    model.modifyItem(4, "Four", "aaa");
-    model.modifyItem(5, "Four", "aaa");
-    model.modifyItem(6, "Five", "aaa");
-    model.modifyItem(7, "Five", "aaa");
-    model.modifyItem(8, "Five", "aaa");
-    model.modifyItem(9, "Two", "aaa");
-    model.modifyItem(10, "Two", "aaa");
-    model.modifyItem(11, "Two", "aaa");
-    QTRY_COMPARE(findItems<QQuickItem>(contentItem, "sect_aaa").count(), 1);
-    canvas->rootObject()->setProperty("sectionProperty", "name");
-    // ensure view has settled.
-    QTRY_COMPARE(findItems<QQuickItem>(contentItem, "sect_Four").count(), 1);
-    for (int i = 0; i < 4; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem,
-                "sect_" + model.name(i*3));
-        QVERIFY(item);
-        QTRY_COMPARE(item->y(), qreal(i*20*4));
-    }
-
-    // QTBUG-17769
-    model.removeItems(10, 20);
-    // ensure view has settled.
-    QTRY_COMPARE(findItems<QQuickItem>(contentItem, "wrapper").count(), 10);
-    // Drag view up beyond bounds
-    QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(20,20));
-    {
-        QMouseEvent mv(QEvent::MouseMove, QPoint(20,0), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
-        QApplication::sendEvent(canvas, &mv);
-    }
-    {
-        QMouseEvent mv(QEvent::MouseMove, QPoint(20,-50), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
-        QApplication::sendEvent(canvas, &mv);
-    }
-    {
-        QMouseEvent mv(QEvent::MouseMove, QPoint(20,-200), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
-        QApplication::sendEvent(canvas, &mv);
-    }
-    QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(20,-200));
-    // view should settle back at 0
-    QTRY_COMPARE(listview->contentY(), 0.0);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::sectionsPositioning()
-{
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    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(TESTDATA("listview-sections_delegate.qml")));
-    qApp->processEvents();
-    canvas->rootObject()->setProperty("sectionPositioning", QVariant(int(QQuickViewSection::InlineLabels | QQuickViewSection::CurrentLabelAtStart | QQuickViewSection::NextLabelAtEnd)));
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    for (int i = 0; i < 3; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "sect_" + QString::number(i));
-        QVERIFY(item);
-        QTRY_COMPARE(item->y(), qreal(i*20*6));
-    }
-
-    QQuickItem *topItem = findVisibleChild(contentItem, "sect_0"); // section header
-    QVERIFY(topItem);
-    QCOMPARE(topItem->y(), 0.);
-
-    QQuickItem *bottomItem = findVisibleChild(contentItem, "sect_3"); // section footer
-    QVERIFY(bottomItem);
-    QCOMPARE(bottomItem->y(), 300.);
-
-    // move down a little and check that section header is at top
-    listview->setContentY(10);
-    QCOMPARE(topItem->y(), 0.);
-
-    // push the top header up
-    listview->setContentY(110);
-    topItem = findVisibleChild(contentItem, "sect_0"); // section header
-    QVERIFY(topItem);
-    QCOMPARE(topItem->y(), 100.);
-
-    QQuickItem *item = findVisibleChild(contentItem, "sect_1");
-    QVERIFY(item);
-    QCOMPARE(item->y(), 120.);
-
-    bottomItem = findVisibleChild(contentItem, "sect_4"); // section footer
-    QVERIFY(bottomItem);
-    QCOMPARE(bottomItem->y(), 410.);
-
-    // Move past section 0
-    listview->setContentY(120);
-    topItem = findVisibleChild(contentItem, "sect_0"); // section header
-    QVERIFY(!topItem);
-
-    // Push section footer down
-    listview->setContentY(70);
-    bottomItem = findVisibleChild(contentItem, "sect_4"); // section footer
-    QVERIFY(bottomItem);
-    QCOMPARE(bottomItem->y(), 380.);
-
-    // Change current section
-    listview->setContentY(10);
-    model.modifyItem(0, "One", "aaa");
-    model.modifyItem(1, "Two", "aaa");
-    model.modifyItem(2, "Three", "aaa");
-    model.modifyItem(3, "Four", "aaa");
-    model.modifyItem(4, "Five", "aaa");
-    QTest::qWait(300);
-
-    QTRY_COMPARE(listview->currentSection(), QString("aaa"));
-
-    for (int i = 0; i < 3; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem,
-                "sect_" + (i == 0 ? QString("aaa") : QString::number(i)));
-        QVERIFY(item);
-        QTRY_COMPARE(item->y(), qreal(i*20*6));
-    }
-
-    topItem = findVisibleChild(contentItem, "sect_aaa"); // section header
-    QVERIFY(topItem);
-    QCOMPARE(topItem->y(), 10.);
-
-    // remove section boundary
-    listview->setContentY(120);
-    model.removeItem(5);
-    QTRY_COMPARE(listview->count(), model.count());
-    for (int i = 0; i < 3; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem,
-                "sect_" + (i == 0 ? QString("aaa") : QString::number(i)));
-        QVERIFY(item);
-        QTRY_COMPARE(item->y(), qreal(i*20*6));
-    }
-
-    QVERIFY(topItem = findVisibleChild(contentItem, "sect_1"));
-    QTRY_COMPARE(topItem->y(), 120.);
-
-    // Change the next section
-    listview->setContentY(0);
-    bottomItem = findVisibleChild(contentItem, "sect_3"); // section footer
-    QVERIFY(bottomItem);
-    QTRY_COMPARE(bottomItem->y(), 300.);
-
-    model.modifyItem(14, "New", "new");
-
-    QTRY_VERIFY(bottomItem = findVisibleChild(contentItem, "sect_new")); // section footer
-    QTRY_COMPARE(bottomItem->y(), 300.);
-
-    // Turn sticky footer off
-    listview->setContentY(40);
-    canvas->rootObject()->setProperty("sectionPositioning", QVariant(int(QQuickViewSection::InlineLabels | QQuickViewSection::CurrentLabelAtStart)));
-    item = findVisibleChild(contentItem, "sect_new"); // inline label restored
-    QVERIFY(item);
-    QCOMPARE(item->y(), 360.);
-
-    // Turn sticky header off
-    listview->setContentY(30);
-    canvas->rootObject()->setProperty("sectionPositioning", QVariant(int(QQuickViewSection::InlineLabels)));
-    item = findVisibleChild(contentItem, "sect_aaa"); // inline label restored
-    QVERIFY(item);
-    QCOMPARE(item->y(), 0.);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::currentIndex_delayedItemCreation()
-{
-    QFETCH(bool, setCurrentToZero);
-
-    QQuickView *canvas = createView();
-
-    TestModel model;
-
-    // test currentIndexChanged() is emitted even if currentIndex = 0 on start up
-    // (since the currentItem will have changed and that shares the same index)
-    canvas->rootContext()->setContextProperty("setCurrentToZero", setCurrentToZero);
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("fillModelOnComponentCompleted.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QSignalSpy spy(listview, SIGNAL(currentItemChanged()));
-    QCOMPARE(listview->currentIndex(), 0);
-    QTRY_COMPARE(spy.count(), 1);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::currentIndex_delayedItemCreation_data()
-{
-    QTest::addColumn<bool>("setCurrentToZero");
-
-    QTest::newRow("set to 0") << true;
-    QTest::newRow("don't set to 0") << false;
-}
-
-void tst_QQuickListView::currentIndex()
-{
-    TestModel model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), QString::number(i));
-
-    QQuickView *canvas = new QQuickView(0);
-    canvas->setGeometry(0,0,240,320);
-
-    QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("testWrap", QVariant(false));
-
-    QString filename(TESTDATA("listview-initCurrent.qml"));
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // current item should be 20th item at startup
-    // and current item should be in view
-    QCOMPARE(listview->currentIndex(), 20);
-    QCOMPARE(listview->contentY(), 100.0);
-    QCOMPARE(listview->currentItem(), findItem<QQuickItem>(contentItem, "wrapper", 20));
-    QCOMPARE(listview->highlightItem()->y(), listview->currentItem()->y());
-
-    // no wrap
-    listview->setCurrentIndex(0);
-    QCOMPARE(listview->currentIndex(), 0);
-    // confirm that the velocity is updated
-    QTRY_VERIFY(listview->verticalVelocity() != 0.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);
-
-    QTRY_COMPARE(listview->contentY(), 280.0);
-
-    listview->incrementCurrentIndex();
-    QCOMPARE(listview->currentIndex(), 0);
-
-    QTRY_COMPARE(listview->contentY(), 0.0);
-
-
-    // footer should become visible if it is out of view, and then current index is set to count-1
-    canvas->rootObject()->setProperty("showFooter", true);
-    QTRY_VERIFY(listview->footerItem());
-    listview->setCurrentIndex(model.count()-2);
-    QTRY_VERIFY(listview->footerItem()->y() > listview->contentY() + listview->height());
-    listview->setCurrentIndex(model.count()-1);
-    QTRY_COMPARE(listview->contentY() + listview->height(), (20.0 * model.count()) + listview->footerItem()->height());
-    canvas->rootObject()->setProperty("showFooter", false);
-
-    // header should become visible if it is out of view, and then current index is set to 0
-    canvas->rootObject()->setProperty("showHeader", true);
-    QTRY_VERIFY(listview->headerItem());
-    listview->setCurrentIndex(1);
-    QTRY_VERIFY(listview->headerItem()->y() + listview->headerItem()->height() < listview->contentY());
-    listview->setCurrentIndex(0);
-    QTRY_COMPARE(listview->contentY(), -listview->headerItem()->height());
-    canvas->rootObject()->setProperty("showHeader", false);
-
-
-    // Test keys
-    canvas->show();
-    canvas->requestActivateWindow();
-    QTest::qWaitForWindowShown(canvas);
-    QTRY_VERIFY(qGuiApp->focusWindow() == canvas);
-
-    listview->setCurrentIndex(0);
-
-    QTest::keyClick(canvas, Qt::Key_Down);
-    QCOMPARE(listview->currentIndex(), 1);
-
-    QTest::keyClick(canvas, Qt::Key_Up);
-    QCOMPARE(listview->currentIndex(), 0);
-
-    // hold down Key_Down
-    for (int i=0; i<model.count()-1; i++) {
-        QTest::simulateEvent(canvas, true, Qt::Key_Down, Qt::NoModifier, "", true);
-        QTRY_COMPARE(listview->currentIndex(), i+1);
-    }
-    QTest::keyRelease(canvas, Qt::Key_Down);
-    QTRY_COMPARE(listview->currentIndex(), model.count()-1);
-    QTRY_COMPARE(listview->contentY(), 280.0);
-
-    // hold down Key_Up
-    for (int i=model.count()-1; i > 0; i--) {
-        QTest::simulateEvent(canvas, true, Qt::Key_Up, Qt::NoModifier, "", true);
-        QTRY_COMPARE(listview->currentIndex(), i-1);
-    }
-    QTest::keyRelease(canvas, Qt::Key_Up);
-    QTRY_COMPARE(listview->currentIndex(), 0);
-    QTRY_COMPARE(listview->contentY(), 0.0);
-
-
-    // turn off auto highlight
-    listview->setHighlightFollowsCurrentItem(false);
-    QVERIFY(listview->highlightFollowsCurrentItem() == false);
-
-    QVERIFY(listview->highlightItem());
-    qreal hlPos = listview->highlightItem()->y();
-
-    listview->setCurrentIndex(4);
-    QTRY_COMPARE(listview->highlightItem()->y(), hlPos);
-
-    // insert item before currentIndex
-    listview->setCurrentIndex(28);
-    model.insertItem(0, "Foo", "1111");
-    QTRY_COMPARE(canvas->rootObject()->property("current").toInt(), 29);
-
-    // check removing highlight by setting currentIndex to -1;
-    listview->setCurrentIndex(-1);
-
-    QCOMPARE(listview->currentIndex(), -1);
-    QVERIFY(!listview->highlightItem());
-    QVERIFY(!listview->currentItem());
-
-    delete canvas;
-}
-
-void tst_QQuickListView::noCurrentIndex()
-{
-    TestModel model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), QString::number(i));
-
-    QQuickView *canvas = new QQuickView(0);
-    canvas->setGeometry(0,0,240,320);
-
-    QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    QString filename(TESTDATA("listview-noCurrent.qml"));
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // current index should be -1 at startup
-    // and we should not have a currentItem or highlightItem
-    QCOMPARE(listview->currentIndex(), -1);
-    QCOMPARE(listview->contentY(), 0.0);
-    QVERIFY(!listview->highlightItem());
-    QVERIFY(!listview->currentItem());
-
-    listview->setCurrentIndex(2);
-    QCOMPARE(listview->currentIndex(), 2);
-    QVERIFY(listview->highlightItem());
-    QVERIFY(listview->currentItem());
-
-    delete canvas;
-}
-
-void tst_QQuickListView::itemList()
-{
-    QQuickView *canvas = createView();
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("itemlist.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "view");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QQuickVisualItemModel *model = canvas->rootObject()->findChild<QQuickVisualItemModel*>("itemModel");
-    QTRY_VERIFY(model != 0);
-
-    QTRY_VERIFY(model->count() == 3);
-    QTRY_COMPARE(listview->currentIndex(), 0);
-
-    QQuickItem *item = findItem<QQuickItem>(contentItem, "item1");
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(item->x(), 0.0);
-    QCOMPARE(item->height(), listview->height());
-
-    QQuickText *text = findItem<QQuickText>(contentItem, "text1");
-    QTRY_VERIFY(text);
-    QTRY_COMPARE(text->text(), QLatin1String("index: 0"));
-
-    listview->setCurrentIndex(2);
-
-    item = findItem<QQuickItem>(contentItem, "item3");
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(item->x(), 480.0);
-
-    text = findItem<QQuickText>(contentItem, "text3");
-    QTRY_VERIFY(text);
-    QTRY_COMPARE(text->text(), QLatin1String("index: 2"));
-
-    delete canvas;
-}
-
-void tst_QQuickListView::cacheBuffer()
-{
-    QQuickView *canvas = createView();
-
-    TestModel model;
-    for (int i = 0; i < 90; 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(TESTDATA("listviewtest.qml")));
-    canvas->show();
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-    QTRY_VERIFY(listview->delegate() != 0);
-    QTRY_VERIFY(listview->model() != 0);
-    QTRY_VERIFY(listview->highlight() != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*20);
-    }
-
-    QDeclarativeIncubationController controller;
-    canvas->engine()->setIncubationController(&controller);
-
-    testObject->setCacheBuffer(200);
-    QTRY_VERIFY(listview->cacheBuffer() == 200);
-
-    // items will be created one at a time
-    for (int i = itemCount; i < qMin(itemCount+10,model.count()); ++i) {
-        QVERIFY(findItem<QQuickItem>(listview, "wrapper", i) == 0);
-        QQuickItem *item = 0;
-        while (!item) {
-            bool b = false;
-            controller.incubateWhile(&b);
-            item = findItem<QQuickItem>(listview, "wrapper", i);
-        }
-    }
-
-    {
-        bool b = true;
-        controller.incubateWhile(&b);
-    }
-
-    int newItemCount = 0;
-    newItemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-
-    // Confirm items positioned correctly
-    for (int i = 0; i < model.count() && i < newItemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*20);
-    }
-
-    // move view and confirm items in view are visible immediately and outside are created async
-    listview->setContentY(300);
-
-    for (int i = 15; i < 32; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item);
-        QVERIFY(item->y() == i*20);
-    }
-
-    QVERIFY(findItem<QQuickItem>(listview, "wrapper", 32) == 0);
-
-    // ensure buffered items are created
-    for (int i = 32; i < qMin(41,model.count()); ++i) {
-        QQuickItem *item = 0;
-        while (!item) {
-            qGuiApp->processEvents(); // allow refill to happen
-            bool b = false;
-            controller.incubateWhile(&b);
-            item = findItem<QQuickItem>(listview, "wrapper", i);
-        }
-    }
-
-    {
-        bool b = true;
-        controller.incubateWhile(&b);
-    }
-
-    delete canvas;
-    delete testObject;
-}
-
-void tst_QQuickListView::positionViewAtIndex()
-{
-    QQuickView *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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), i*20.);
-    }
-
-    // Position on a currently visible item
-    listview->positionViewAtIndex(3, QQuickListView::Beginning);
-    QTRY_COMPARE(listview->contentY(), 60.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 3; i < model.count() && i < itemCount-3-1; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), i*20.);
-    }
-
-    // Position on an item beyond the visible items
-    listview->positionViewAtIndex(22, QQuickListView::Beginning);
-    QTRY_COMPARE(listview->contentY(), 440.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 22; i < model.count() && i < itemCount-22-1; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), i*20.);
-    }
-
-    // Position on an item that would leave empty space if positioned at the top
-    listview->positionViewAtIndex(28, QQuickListView::Beginning);
-    QTRY_COMPARE(listview->contentY(), 480.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 24; i < model.count() && i < itemCount-24-1; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), i*20.);
-    }
-
-    // Position at the beginning again
-    listview->positionViewAtIndex(0, QQuickListView::Beginning);
-    QTRY_COMPARE(listview->contentY(), 0.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), i*20.);
-    }
-
-    // Position at End using last index
-    listview->positionViewAtIndex(model.count()-1, QQuickListView::End);
-    QTRY_COMPARE(listview->contentY(), 480.);
-
-    // Confirm items positioned correctly
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 24; i < model.count(); ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), i*20.);
-    }
-
-    // Position at End
-    listview->positionViewAtIndex(20, QQuickListView::End);
-    QTRY_COMPARE(listview->contentY(), 100.);
-
-    // Position in Center
-    listview->positionViewAtIndex(15, QQuickListView::Center);
-    QTRY_COMPARE(listview->contentY(), 150.);
-
-    // Ensure at least partially visible
-    listview->positionViewAtIndex(15, QQuickListView::Visible);
-    QTRY_COMPARE(listview->contentY(), 150.);
-
-    listview->setContentY(302);
-    listview->positionViewAtIndex(15, QQuickListView::Visible);
-    QTRY_COMPARE(listview->contentY(), 302.);
-
-    listview->setContentY(320);
-    listview->positionViewAtIndex(15, QQuickListView::Visible);
-    QTRY_COMPARE(listview->contentY(), 300.);
-
-    listview->setContentY(85);
-    listview->positionViewAtIndex(20, QQuickListView::Visible);
-    QTRY_COMPARE(listview->contentY(), 85.);
-
-    listview->setContentY(75);
-    listview->positionViewAtIndex(20, QQuickListView::Visible);
-    QTRY_COMPARE(listview->contentY(), 100.);
-
-    // Ensure completely visible
-    listview->setContentY(120);
-    listview->positionViewAtIndex(20, QQuickListView::Contain);
-    QTRY_COMPARE(listview->contentY(), 120.);
-
-    listview->setContentY(302);
-    listview->positionViewAtIndex(15, QQuickListView::Contain);
-    QTRY_COMPARE(listview->contentY(), 300.);
-
-    listview->setContentY(85);
-    listview->positionViewAtIndex(20, QQuickListView::Contain);
-    QTRY_COMPARE(listview->contentY(), 100.);
-
-    // positionAtBeginnging
-    listview->positionViewAtBeginning();
-    QTRY_COMPARE(listview->contentY(), 0.);
-
-    listview->setContentY(80);
-    canvas->rootObject()->setProperty("showHeader", true);
-    listview->positionViewAtBeginning();
-    QTRY_COMPARE(listview->contentY(), -30.);
-
-    // positionAtEnd
-    listview->positionViewAtEnd();
-    QTRY_COMPARE(listview->contentY(), 480.); // 40*20 - 320
-
-    listview->setContentY(80);
-    canvas->rootObject()->setProperty("showFooter", true);
-    listview->positionViewAtEnd();
-    QTRY_COMPARE(listview->contentY(), 510.);
-
-    // set current item to outside visible view, position at beginning
-    // and ensure highlight moves to current item
-    listview->setCurrentIndex(1);
-    listview->positionViewAtBeginning();
-    QTRY_COMPARE(listview->contentY(), -30.);
-    QVERIFY(listview->highlightItem());
-    QCOMPARE(listview->highlightItem()->y(), 20.);
-
-    delete canvas;
-    delete testObject;
-}
-
-void tst_QQuickListView::resetModel()
-{
-    QQuickView *canvas = createView();
-
-    QStringList strings;
-    strings << "one" << "two" << "three";
-    QStringListModel model(strings);
-
-    QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("displaylist.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QTRY_COMPARE(listview->count(), model.rowCount());
-
-    for (int i = 0; i < model.rowCount(); ++i) {
-        QQuickText *display = findItem<QQuickText>(contentItem, "displayText", i);
-        QTRY_VERIFY(display != 0);
-        QTRY_COMPARE(display->text(), strings.at(i));
-    }
-
-    strings.clear();
-    strings << "four" << "five" << "six" << "seven";
-    model.setStringList(strings);
-
-    QTRY_COMPARE(listview->count(), model.rowCount());
-
-    for (int i = 0; i < model.rowCount(); ++i) {
-        QQuickText *display = findItem<QQuickText>(contentItem, "displayText", i);
-        QTRY_VERIFY(display != 0);
-        QTRY_COMPARE(display->text(), strings.at(i));
-    }
-
-    delete canvas;
-}
-
-void tst_QQuickListView::propertyChanges()
-{
-    QQuickView *canvas = createView();
-    QTRY_VERIFY(canvas);
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml")));
-
-    QQuickListView *listView = canvas->rootObject()->findChild<QQuickListView*>("listView");
-    QTRY_VERIFY(listView);
-
-    QSignalSpy highlightFollowsCurrentItemSpy(listView, SIGNAL(highlightFollowsCurrentItemChanged()));
-    QSignalSpy preferredHighlightBeginSpy(listView, SIGNAL(preferredHighlightBeginChanged()));
-    QSignalSpy preferredHighlightEndSpy(listView, SIGNAL(preferredHighlightEndChanged()));
-    QSignalSpy highlightRangeModeSpy(listView, SIGNAL(highlightRangeModeChanged()));
-    QSignalSpy keyNavigationWrapsSpy(listView, SIGNAL(keyNavigationWrapsChanged()));
-    QSignalSpy cacheBufferSpy(listView, SIGNAL(cacheBufferChanged()));
-    QSignalSpy snapModeSpy(listView, SIGNAL(snapModeChanged()));
-
-    QTRY_COMPARE(listView->highlightFollowsCurrentItem(), true);
-    QTRY_COMPARE(listView->preferredHighlightBegin(), 0.0);
-    QTRY_COMPARE(listView->preferredHighlightEnd(), 0.0);
-    QTRY_COMPARE(listView->highlightRangeMode(), QQuickListView::ApplyRange);
-    QTRY_COMPARE(listView->isWrapEnabled(), true);
-    QTRY_COMPARE(listView->cacheBuffer(), 10);
-    QTRY_COMPARE(listView->snapMode(), QQuickListView::SnapToItem);
-
-    listView->setHighlightFollowsCurrentItem(false);
-    listView->setPreferredHighlightBegin(1.0);
-    listView->setPreferredHighlightEnd(1.0);
-    listView->setHighlightRangeMode(QQuickListView::StrictlyEnforceRange);
-    listView->setWrapEnabled(false);
-    listView->setCacheBuffer(3);
-    listView->setSnapMode(QQuickListView::SnapOneItem);
-
-    QTRY_COMPARE(listView->highlightFollowsCurrentItem(), false);
-    QTRY_COMPARE(listView->preferredHighlightBegin(), 1.0);
-    QTRY_COMPARE(listView->preferredHighlightEnd(), 1.0);
-    QTRY_COMPARE(listView->highlightRangeMode(), QQuickListView::StrictlyEnforceRange);
-    QTRY_COMPARE(listView->isWrapEnabled(), false);
-    QTRY_COMPARE(listView->cacheBuffer(), 3);
-    QTRY_COMPARE(listView->snapMode(), QQuickListView::SnapOneItem);
-
-    QTRY_COMPARE(highlightFollowsCurrentItemSpy.count(),1);
-    QTRY_COMPARE(preferredHighlightBeginSpy.count(),1);
-    QTRY_COMPARE(preferredHighlightEndSpy.count(),1);
-    QTRY_COMPARE(highlightRangeModeSpy.count(),1);
-    QTRY_COMPARE(keyNavigationWrapsSpy.count(),1);
-    QTRY_COMPARE(cacheBufferSpy.count(),1);
-    QTRY_COMPARE(snapModeSpy.count(),1);
-
-    listView->setHighlightFollowsCurrentItem(false);
-    listView->setPreferredHighlightBegin(1.0);
-    listView->setPreferredHighlightEnd(1.0);
-    listView->setHighlightRangeMode(QQuickListView::StrictlyEnforceRange);
-    listView->setWrapEnabled(false);
-    listView->setCacheBuffer(3);
-    listView->setSnapMode(QQuickListView::SnapOneItem);
-
-    QTRY_COMPARE(highlightFollowsCurrentItemSpy.count(),1);
-    QTRY_COMPARE(preferredHighlightBeginSpy.count(),1);
-    QTRY_COMPARE(preferredHighlightEndSpy.count(),1);
-    QTRY_COMPARE(highlightRangeModeSpy.count(),1);
-    QTRY_COMPARE(keyNavigationWrapsSpy.count(),1);
-    QTRY_COMPARE(cacheBufferSpy.count(),1);
-    QTRY_COMPARE(snapModeSpy.count(),1);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::componentChanges()
-{
-    QQuickView *canvas = createView();
-    QTRY_VERIFY(canvas);
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml")));
-
-    QQuickListView *listView = canvas->rootObject()->findChild<QQuickListView*>("listView");
-    QTRY_VERIFY(listView);
-
-    QDeclarativeComponent component(canvas->engine());
-    component.setData("import QtQuick 2.0; Rectangle { color: \"blue\"; }", QUrl::fromLocalFile(""));
-
-    QDeclarativeComponent delegateComponent(canvas->engine());
-    delegateComponent.setData("import QtQuick 2.0; Text { text: '<b>Name:</b> ' + name }", QUrl::fromLocalFile(""));
-
-    QSignalSpy highlightSpy(listView, SIGNAL(highlightChanged()));
-    QSignalSpy delegateSpy(listView, SIGNAL(delegateChanged()));
-    QSignalSpy headerSpy(listView, SIGNAL(headerChanged()));
-    QSignalSpy footerSpy(listView, SIGNAL(footerChanged()));
-
-    listView->setHighlight(&component);
-    listView->setHeader(&component);
-    listView->setFooter(&component);
-    listView->setDelegate(&delegateComponent);
-
-    QTRY_COMPARE(listView->highlight(), &component);
-    QTRY_COMPARE(listView->header(), &component);
-    QTRY_COMPARE(listView->footer(), &component);
-    QTRY_COMPARE(listView->delegate(), &delegateComponent);
-
-    QTRY_COMPARE(highlightSpy.count(),1);
-    QTRY_COMPARE(delegateSpy.count(),1);
-    QTRY_COMPARE(headerSpy.count(),1);
-    QTRY_COMPARE(footerSpy.count(),1);
-
-    listView->setHighlight(&component);
-    listView->setHeader(&component);
-    listView->setFooter(&component);
-    listView->setDelegate(&delegateComponent);
-
-    QTRY_COMPARE(highlightSpy.count(),1);
-    QTRY_COMPARE(delegateSpy.count(),1);
-    QTRY_COMPARE(headerSpy.count(),1);
-    QTRY_COMPARE(footerSpy.count(),1);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::modelChanges()
-{
-    QQuickView *canvas = createView();
-    QTRY_VERIFY(canvas);
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml")));
-
-    QQuickListView *listView = canvas->rootObject()->findChild<QQuickListView*>("listView");
-    QTRY_VERIFY(listView);
-
-    QDeclarativeListModel *alternateModel = canvas->rootObject()->findChild<QDeclarativeListModel*>("alternateModel");
-    QTRY_VERIFY(alternateModel);
-    QVariant modelVariant = QVariant::fromValue<QObject *>(alternateModel);
-    QSignalSpy modelSpy(listView, SIGNAL(modelChanged()));
-
-    listView->setModel(modelVariant);
-    QTRY_COMPARE(listView->model(), modelVariant);
-    QTRY_COMPARE(modelSpy.count(),1);
-
-    listView->setModel(modelVariant);
-    QTRY_COMPARE(modelSpy.count(),1);
-
-    listView->setModel(QVariant());
-    QTRY_COMPARE(modelSpy.count(),2);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::QTBUG_9791()
-{
-    QQuickView *canvas = createView();
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("strictlyenforcerange.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject());
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-    QTRY_VERIFY(listview->delegate() != 0);
-    QTRY_VERIFY(listview->model() != 0);
-
-    QMetaObject::invokeMethod(listview, "fillModel");
-    qApp->processEvents();
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    QCOMPARE(itemCount, 3);
-
-    for (int i = 0; i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->x(), i*300.0);
-    }
-
-    // check that view is positioned correctly
-    QTRY_COMPARE(listview->contentX(), 590.0);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::manualHighlight()
-{
-    QQuickView *canvas = new QQuickView(0);
-    canvas->setGeometry(0,0,240,320);
-
-    QString filename(TESTDATA("manual-highlight.qml"));
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QTRY_COMPARE(listview->currentIndex(), 0);
-    QTRY_COMPARE(listview->currentItem(), findItem<QQuickItem>(contentItem, "wrapper", 0));
-    QTRY_COMPARE(listview->highlightItem()->y() - 5, listview->currentItem()->y());
-
-    listview->setCurrentIndex(2);
-
-    QTRY_COMPARE(listview->currentIndex(), 2);
-    QTRY_COMPARE(listview->currentItem(), findItem<QQuickItem>(contentItem, "wrapper", 2));
-    QTRY_COMPARE(listview->highlightItem()->y() - 5, listview->currentItem()->y());
-
-    // QTBUG-15972
-    listview->positionViewAtIndex(3, QQuickListView::Contain);
-
-    QTRY_COMPARE(listview->currentIndex(), 2);
-    QTRY_COMPARE(listview->currentItem(), findItem<QQuickItem>(contentItem, "wrapper", 2));
-    QTRY_COMPARE(listview->highlightItem()->y() - 5, listview->currentItem()->y());
-
-    delete canvas;
-}
-
-void tst_QQuickListView::QTBUG_11105()
-{
-    QQuickView *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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*20);
-    }
-
-    listview->positionViewAtIndex(20, QQuickListView::Beginning);
-    QCOMPARE(listview->contentY(), 280.);
-
-    TestModel model2;
-    for (int i = 0; i < 5; i++)
-        model2.addItem("Item" + QString::number(i), "");
-
-    ctxt->setContextProperty("testModel", &model2);
-
-    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    QCOMPARE(itemCount, 5);
-
-    delete canvas;
-    delete testObject;
-}
-
-void tst_QQuickListView::header()
-{
-    QFETCH(QQuickListView::Orientation, orientation);
-    QFETCH(Qt::LayoutDirection, layoutDirection);
-    QFETCH(QPointF, initialHeaderPos);
-    QFETCH(QPointF, firstDelegatePos);
-    QFETCH(QPointF, initialContentPos);
-    QFETCH(QPointF, changedHeaderPos);
-    QFETCH(QPointF, changedContentPos);
-    QFETCH(QPointF, resizeContentPos);
-
-    TestModel model;
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QQuickView *canvas = createView();
-    canvas->rootContext()->setContextProperty("testModel", &model);
-    canvas->rootContext()->setContextProperty("initialViewWidth", 240);
-    canvas->rootContext()->setContextProperty("initialViewHeight", 320);
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("header.qml")));
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-    listview->setOrientation(orientation);
-    listview->setLayoutDirection(layoutDirection);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QQuickText *header = findItem<QQuickText>(contentItem, "header");
-    QVERIFY(header);
-
-    QVERIFY(header == listview->headerItem());
-
-    QCOMPARE(header->width(), 100.);
-    QCOMPARE(header->height(), 30.);
-    QCOMPARE(header->pos(), initialHeaderPos);
-    QCOMPARE(QPointF(listview->contentX(), listview->contentY()), initialContentPos);
-
-    QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 0);
-    QVERIFY(item);
-    QCOMPARE(item->pos(), firstDelegatePos);
-
-    model.clear();
-    QCOMPARE(header->pos(), initialHeaderPos); // header should stay where it is
-
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QSignalSpy headerItemSpy(listview, SIGNAL(headerItemChanged()));
-    QMetaObject::invokeMethod(canvas->rootObject(), "changeHeader");
-
-    QCOMPARE(headerItemSpy.count(), 1);
-
-    header = findItem<QQuickText>(contentItem, "header");
-    QVERIFY(!header);
-    header = findItem<QQuickText>(contentItem, "header2");
-    QVERIFY(header);
-
-    QVERIFY(header == listview->headerItem());
-
-    QCOMPARE(header->pos(), changedHeaderPos);
-    QCOMPARE(header->width(), 50.);
-    QCOMPARE(header->height(), 20.);
-    QTRY_COMPARE(QPointF(listview->contentX(), listview->contentY()), changedContentPos);
-    QCOMPARE(item->pos(), firstDelegatePos);
-
-    delete canvas;
-
-
-    // QTBUG-21207 header should become visible if view resizes from initial empty size
-
-    canvas = createView();
-    canvas->rootContext()->setContextProperty("testModel", &model);
-    canvas->rootContext()->setContextProperty("initialViewWidth", 0.0);
-    canvas->rootContext()->setContextProperty("initialViewHeight", 0.0);
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("header.qml")));
-
-    listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-    listview->setOrientation(orientation);
-    listview->setLayoutDirection(layoutDirection);
-
-    listview->setWidth(240);
-    listview->setHeight(320);
-    QTRY_COMPARE(listview->headerItem()->pos(), initialHeaderPos);
-    QCOMPARE(QPointF(listview->contentX(), listview->contentY()), initialContentPos);
-
-
-    delete canvas;
-}
-
-void tst_QQuickListView::header_data()
-{
-    QTest::addColumn<QQuickListView::Orientation>("orientation");
-    QTest::addColumn<Qt::LayoutDirection>("layoutDirection");
-    QTest::addColumn<QPointF>("initialHeaderPos");
-    QTest::addColumn<QPointF>("changedHeaderPos");
-    QTest::addColumn<QPointF>("initialContentPos");
-    QTest::addColumn<QPointF>("changedContentPos");
-    QTest::addColumn<QPointF>("firstDelegatePos");
-    QTest::addColumn<QPointF>("resizeContentPos");
-
-    // header1 = 100 x 30
-    // header2 = 50 x 20
-    // delegates = 240 x 20
-    // view width = 240
-
-    // header above items, top left
-    QTest::newRow("vertical, left to right") << QQuickListView::Vertical << Qt::LeftToRight
-        << QPointF(0, -30)
-        << QPointF(0, -20)
-        << QPointF(0, -30)
-        << QPointF(0, -20)
-        << QPointF(0, 0)
-        << QPointF(0, -10);
-
-    // header above items, top right
-    QTest::newRow("vertical, layout right to left") << QQuickListView::Vertical << Qt::RightToLeft
-        << QPointF(0, -30)
-        << QPointF(0, -20)
-        << QPointF(0, -30)
-        << QPointF(0, -20)
-        << QPointF(0, 0)
-        << QPointF(0, -10);
-
-    // header to left of items
-    QTest::newRow("horizontal, layout left to right") << QQuickListView::Horizontal << Qt::LeftToRight
-        << QPointF(-100, 0)
-        << QPointF(-50, 0)
-        << QPointF(-100, 0)
-        << QPointF(-50, 0)
-        << QPointF(0, 0)
-        << QPointF(-40, 0);
-
-    // header to right of items
-    QTest::newRow("horizontal, layout right to left") << QQuickListView::Horizontal << Qt::RightToLeft
-        << QPointF(0, 0)
-        << QPointF(0, 0)
-        << QPointF(-240 + 100, 0)
-        << QPointF(-240 + 50, 0)
-        << QPointF(-240, 0)
-        << QPointF(-240 + 40, 0);
-}
-
-void tst_QQuickListView::header_delayItemCreation()
-{
-    QQuickView *canvas = createView();
-
-    TestModel model;
-
-    canvas->rootContext()->setContextProperty("setCurrentToZero", QVariant(false));
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("fillModelOnComponentCompleted.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QQuickText *header = findItem<QQuickText>(contentItem, "header");
-    QVERIFY(header);
-    QCOMPARE(header->y(), -header->height());
-
-    QCOMPARE(listview->contentY(), -header->height());
-
-    model.clear();
-    QTRY_COMPARE(header->y(), -header->height());
-
-    delete canvas;
-}
-
-void tst_QQuickListView::footer()
-{
-    QFETCH(QQuickListView::Orientation, orientation);
-    QFETCH(Qt::LayoutDirection, layoutDirection);
-    QFETCH(QPointF, initialFooterPos);
-    QFETCH(QPointF, firstDelegatePos);
-    QFETCH(QPointF, initialContentPos);
-    QFETCH(QPointF, changedFooterPos);
-    QFETCH(QPointF, changedContentPos);
-    QFETCH(QPointF, resizeContentPos);
-
-    QQuickView *canvas = createView();
-
-    TestModel model;
-    for (int i = 0; i < 3; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("footer.qml")));
-    canvas->show();
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-    listview->setOrientation(orientation);
-    listview->setLayoutDirection(layoutDirection);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QQuickText *footer = findItem<QQuickText>(contentItem, "footer");
-    QVERIFY(footer);
-
-    QVERIFY(footer == listview->footerItem());
-
-    QCOMPARE(footer->pos(), initialFooterPos);
-    QCOMPARE(footer->width(), 100.);
-    QCOMPARE(footer->height(), 30.);
-    QCOMPARE(QPointF(listview->contentX(), listview->contentY()), initialContentPos);
-
-    QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 0);
-    QVERIFY(item);
-    QCOMPARE(item->pos(), firstDelegatePos);
-
-    // remove one item
-    model.removeItem(1);
-
-    if (orientation == QQuickListView::Vertical) {
-        QTRY_COMPARE(footer->y(), initialFooterPos.y() - 20);   // delegate height = 20
-    } else {
-        QTRY_COMPARE(footer->x(), layoutDirection == Qt::LeftToRight ?
-                initialFooterPos.x() - 40 : initialFooterPos.x() + 40);  // delegate width = 40
-    }
-
-    // remove all items
-    model.clear();
-
-    QPointF posWhenNoItems(0, 0);
-    if (orientation == QQuickListView::Horizontal && layoutDirection == Qt::RightToLeft)
-        posWhenNoItems.setX(-100);
-    QTRY_COMPARE(footer->pos(), posWhenNoItems);
-
-    // if header is present, it's at a negative pos, so the footer should not move
-    canvas->rootObject()->setProperty("showHeader", true);
-    QTRY_COMPARE(footer->pos(), posWhenNoItems);
-    canvas->rootObject()->setProperty("showHeader", false);
-
-    // add 30 items
-    for (int i = 0; i < 30; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QSignalSpy footerItemSpy(listview, SIGNAL(footerItemChanged()));
-    QMetaObject::invokeMethod(canvas->rootObject(), "changeFooter");
-
-    QCOMPARE(footerItemSpy.count(), 1);
-
-    footer = findItem<QQuickText>(contentItem, "footer");
-    QVERIFY(!footer);
-    footer = findItem<QQuickText>(contentItem, "footer2");
-    QVERIFY(footer);
-
-    QVERIFY(footer == listview->footerItem());
-
-    QCOMPARE(footer->pos(), changedFooterPos);
-    QCOMPARE(footer->width(), 50.);
-    QCOMPARE(footer->height(), 20.);
-    QTRY_COMPARE(QPointF(listview->contentX(), listview->contentY()), changedContentPos);
-
-    item = findItem<QQuickItem>(contentItem, "wrapper", 0);
-    QVERIFY(item);
-    QCOMPARE(item->pos(), firstDelegatePos);
-
-    listview->positionViewAtEnd();
-    footer->setHeight(10);
-    footer->setWidth(40);
-    QTRY_COMPARE(QPointF(listview->contentX(), listview->contentY()), resizeContentPos);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::footer_data()
-{
-    QTest::addColumn<QQuickListView::Orientation>("orientation");
-    QTest::addColumn<Qt::LayoutDirection>("layoutDirection");
-    QTest::addColumn<QPointF>("initialFooterPos");
-    QTest::addColumn<QPointF>("changedFooterPos");
-    QTest::addColumn<QPointF>("initialContentPos");
-    QTest::addColumn<QPointF>("changedContentPos");
-    QTest::addColumn<QPointF>("firstDelegatePos");
-    QTest::addColumn<QPointF>("resizeContentPos");
-
-    // footer1 = 100 x 30
-    // footer2 = 50 x 20
-    // delegates = 40 x 20
-    // view width = 240
-    // view height = 320
-
-    // footer below items, bottom left
-    QTest::newRow("vertical, layout left to right") << QQuickListView::Vertical << Qt::LeftToRight
-        << QPointF(0, 3 * 20)
-        << QPointF(0, 30 * 20)  // added 30 items
-        << QPointF(0, 0)
-        << QPointF(0, 0)
-        << QPointF(0, 0)
-        << QPointF(0, 30 * 20 - 320 + 10);
-
-    // footer below items, bottom right
-    QTest::newRow("vertical, layout right to left") << QQuickListView::Vertical << Qt::RightToLeft
-        << QPointF(0, 3 * 20)
-        << QPointF(0, 30 * 20)
-        << QPointF(0, 0)
-        << QPointF(0, 0)
-        << QPointF(0, 0)
-        << QPointF(0, 30 * 20 - 320 + 10);
-
-    // footer to right of items
-    QTest::newRow("horizontal, layout left to right") << QQuickListView::Horizontal << Qt::LeftToRight
-        << QPointF(40 * 3, 0)
-        << QPointF(40 * 30, 0)
-        << QPointF(0, 0)
-        << QPointF(0, 0)
-        << QPointF(0, 0)
-        << QPointF(40 * 30 - 240 + 40, 0);
-
-    // footer to left of items
-    QTest::newRow("horizontal, layout right to left") << QQuickListView::Horizontal << Qt::RightToLeft
-        << QPointF(-(40 * 3) - 100, 0)
-        << QPointF(-(40 * 30) - 50, 0)     // 50 = new footer width
-        << QPointF(-240, 0)
-        << QPointF(-240, 0)
-        << QPointF(-40, 0)
-        << QPointF(-(40 * 30) - 40, 0);
-}
-
-class LVAccessor : public QQuickListView
-{
-public:
-    qreal minY() const { return minYExtent(); }
-    qreal maxY() const { return maxYExtent(); }
-    qreal minX() const { return minXExtent(); }
-    qreal maxX() const { return maxXExtent(); }
-};
-
-void tst_QQuickListView::headerFooter()
-{
-    {
-        // Vertical
-        QQuickView *canvas = createView();
-
-        TestModel model;
-        QDeclarativeContext *ctxt = canvas->rootContext();
-        ctxt->setContextProperty("testModel", &model);
-
-        canvas->setSource(QUrl::fromLocalFile(TESTDATA("headerfooter.qml")));
-        qApp->processEvents();
-
-        QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject());
-        QTRY_VERIFY(listview != 0);
-
-        QQuickItem *contentItem = listview->contentItem();
-        QTRY_VERIFY(contentItem != 0);
-
-        QQuickItem *header = findItem<QQuickItem>(contentItem, "header");
-        QVERIFY(header);
-        QCOMPARE(header->y(), -header->height());
-
-        QQuickItem *footer = findItem<QQuickItem>(contentItem, "footer");
-        QVERIFY(footer);
-        QCOMPARE(footer->y(), 0.);
-
-        QCOMPARE(static_cast<LVAccessor*>(listview)->minY(), header->height());
-        QCOMPARE(static_cast<LVAccessor*>(listview)->maxY(), header->height());
-
-        delete canvas;
-    }
-    {
-        // Horizontal
-        QQuickView *canvas = createView();
-
-        TestModel model;
-        QDeclarativeContext *ctxt = canvas->rootContext();
-        ctxt->setContextProperty("testModel", &model);
-
-        canvas->setSource(QUrl::fromLocalFile(TESTDATA("headerfooter.qml")));
-        canvas->rootObject()->setProperty("horizontal", true);
-        qApp->processEvents();
-
-        QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject());
-        QTRY_VERIFY(listview != 0);
-
-        QQuickItem *contentItem = listview->contentItem();
-        QTRY_VERIFY(contentItem != 0);
-
-        QQuickItem *header = findItem<QQuickItem>(contentItem, "header");
-        QVERIFY(header);
-        QCOMPARE(header->x(), -header->width());
-
-        QQuickItem *footer = findItem<QQuickItem>(contentItem, "footer");
-        QVERIFY(footer);
-        QCOMPARE(footer->x(), 0.);
-
-        QCOMPARE(static_cast<LVAccessor*>(listview)->minX(), header->width());
-        QCOMPARE(static_cast<LVAccessor*>(listview)->maxX(), header->width());
-
-        delete canvas;
-    }
-    {
-        // Horizontal RTL
-        QQuickView *canvas = createView();
-
-        TestModel model;
-        QDeclarativeContext *ctxt = canvas->rootContext();
-        ctxt->setContextProperty("testModel", &model);
-
-        canvas->setSource(QUrl::fromLocalFile(TESTDATA("headerfooter.qml")));
-        canvas->rootObject()->setProperty("horizontal", true);
-        canvas->rootObject()->setProperty("rtl", true);
-        qApp->processEvents();
-
-        QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject());
-        QTRY_VERIFY(listview != 0);
-
-        QQuickItem *contentItem = listview->contentItem();
-        QTRY_VERIFY(contentItem != 0);
-
-        QQuickItem *header = findItem<QQuickItem>(contentItem, "header");
-        QVERIFY(header);
-        QCOMPARE(header->x(), 0.);
-
-        QQuickItem *footer = findItem<QQuickItem>(contentItem, "footer");
-        QVERIFY(footer);
-        QCOMPARE(footer->x(), -footer->width());
-
-        QCOMPARE(static_cast<LVAccessor*>(listview)->minX(), 240. - header->width());
-        QCOMPARE(static_cast<LVAccessor*>(listview)->maxX(), 240. - header->width());
-
-        delete canvas;
-    }
-}
-
-void tst_QQuickListView::resizeView()
-{
-    QQuickView *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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), i*20.);
-    }
-
-    QVariant heightRatio;
-    QMetaObject::invokeMethod(canvas->rootObject(), "heightRatio", Q_RETURN_ARG(QVariant, heightRatio));
-    QCOMPARE(heightRatio.toReal(), 0.4);
-
-    listview->setHeight(200);
-
-    QMetaObject::invokeMethod(canvas->rootObject(), "heightRatio", Q_RETURN_ARG(QVariant, heightRatio));
-    QCOMPARE(heightRatio.toReal(), 0.25);
-
-    delete canvas;
-    delete testObject;
-}
-
-void tst_QQuickListView::resizeViewAndRepaint()
-{
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    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("initialHeight", 100);
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("resizeview.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // item at index 10 should not be currently visible
-    QVERIFY(!findItem<QQuickItem>(contentItem, "wrapper", 10));
-
-    listview->setHeight(320);
-    QTRY_VERIFY(findItem<QQuickItem>(contentItem, "wrapper", 10));
-
-    listview->setHeight(100);
-    QTRY_VERIFY(!findItem<QQuickItem>(contentItem, "wrapper", 10));
-
-    delete canvas;
-}
-
-void tst_QQuickListView::sizeLessThan1()
-{
-    QQuickView *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(TESTDATA("sizelessthan1.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // Confirm items positioned correctly
-    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item);
-        QTRY_COMPARE(item->y(), i*0.5);
-    }
-
-    delete canvas;
-    delete testObject;
-}
-
-void tst_QQuickListView::QTBUG_14821()
-{
-    QQuickView *canvas = createView();
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("qtbug14821.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject());
-    QVERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QVERIFY(contentItem != 0);
-
-    listview->decrementCurrentIndex();
-    QCOMPARE(listview->currentIndex(), 99);
-
-    listview->incrementCurrentIndex();
-    QCOMPARE(listview->currentIndex(), 0);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::resizeDelegate()
-{
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    QStringList strings;
-    for (int i = 0; i < 30; ++i)
-        strings << QString::number(i);
-    QStringListModel model(strings);
-
-    QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("displaylist.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QVERIFY(contentItem != 0);
-
-    QCOMPARE(listview->count(), model.rowCount());
-
-    listview->setCurrentIndex(25);
-    listview->setContentY(0);
-    QTest::qWait(300);
-
-    for (int i = 0; i < 16; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QVERIFY(item != 0);
-        QCOMPARE(item->y(), i*20.0);
-    }
-
-    QCOMPARE(listview->currentItem()->y(), 500.0);
-    QTRY_COMPARE(listview->highlightItem()->y(), 500.0);
-
-    canvas->rootObject()->setProperty("delegateHeight", 30);
-    QTest::qWait(300);
-
-    for (int i = 0; i < 11; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QVERIFY(item != 0);
-        QTRY_COMPARE(item->y(), i*30.0);
-    }
-
-    QTRY_COMPARE(listview->currentItem()->y(), 750.0);
-    QTRY_COMPARE(listview->highlightItem()->y(), 750.0);
-
-    listview->setCurrentIndex(1);
-    listview->positionViewAtIndex(25, QQuickListView::Beginning);
-    listview->positionViewAtIndex(5, QQuickListView::Beginning);
-
-    for (int i = 5; i < 16; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QVERIFY(item != 0);
-        QCOMPARE(item->y(), i*30.0);
-    }
-
-    QTRY_COMPARE(listview->currentItem()->y(), 30.0);
-    QTRY_COMPARE(listview->highlightItem()->y(), 30.0);
-
-    canvas->rootObject()->setProperty("delegateHeight", 20);
-    QTest::qWait(300);
-
-    for (int i = 5; i < 11; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QVERIFY(item != 0);
-        QTRY_COMPARE(item->y(), 150 + (i-5)*20.0);
-    }
-
-    QTRY_COMPARE(listview->currentItem()->y(), 70.0);
-    QTRY_COMPARE(listview->highlightItem()->y(), 70.0);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::resizeFirstDelegate()
-{
-    // QTBUG-20712: Content Y jumps constantly if first delegate height == 0
-    // and other delegates have height > 0
-
-    QSKIP("Test unstable - QTBUG-22872");
-
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    // bug only occurs when all items in the model are visible
-    TestModel model;
-    for (int i = 0; i < 10; 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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QVERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QVERIFY(contentItem != 0);
-
-    QQuickItem *item = 0;
-    for (int i = 0; i < model.count(); ++i) {
-        item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QVERIFY(item != 0);
-        QCOMPARE(item->y(), i*20.0);
-    }
-
-    item = findItem<QQuickItem>(contentItem, "wrapper", 0);
-    item->setHeight(0);
-
-    // check the content y has not jumped up and down
-    QCOMPARE(listview->contentY(), 0.0);
-    QSignalSpy spy(listview, SIGNAL(contentYChanged()));
-    QTest::qWait(100);
-    QCOMPARE(spy.count(), 0);
-
-    for (int i = 1; i < model.count(); ++i) {
-        item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QVERIFY(item != 0);
-        QTRY_COMPARE(item->y(), (i-1)*20.0);
-    }
-
-
-    // QTBUG-22014: refill doesn't clear items scrolling off the top of the
-    // list if they follow a zero-sized delegate
-
-    for (int i = 0; i < 10; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    item = findItem<QQuickItem>(contentItem, "wrapper", 1);
-    QVERIFY(item);
-    item->setHeight(0);
-
-    listview->setCurrentIndex(19);
-    qApp->processEvents();
-
-    // items 0-2 should have been deleted
-    for (int i=0; i<3; i++) {
-        QTRY_VERIFY(!findItem<QQuickItem>(contentItem, "wrapper", i));
-    }
-
-    delete testObject;
-    delete canvas;
-}
-
-void tst_QQuickListView::QTBUG_16037()
-{
-    QQuickView *canvas = createView();
-    canvas->show();
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("qtbug16037.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "listview");
-    QTRY_VERIFY(listview != 0);
-
-    QVERIFY(listview->contentHeight() <= 0.0);
-
-    QMetaObject::invokeMethod(canvas->rootObject(), "setModel");
-
-    QTRY_COMPARE(listview->contentHeight(), 80.0);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::indexAt()
-{
-    QQuickView *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(TESTDATA("listviewtest.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QCOMPARE(listview->indexAt(0,0), 0);
-    QCOMPARE(listview->indexAt(0,19), 0);
-    QCOMPARE(listview->indexAt(239,19), 0);
-    QCOMPARE(listview->indexAt(0,20), 1);
-    QCOMPARE(listview->indexAt(240,20), -1);
-
-    delete canvas;
-    delete testObject;
-}
-
-void tst_QQuickListView::incrementalModel()
-{
-    QQuickView *canvas = createView();
-
-    IncrementalModel model;
-    QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("displaylist.qml")));
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QTRY_COMPARE(listview->count(), 20);
-
-    listview->positionViewAtIndex(10, QQuickListView::Beginning);
-
-    QTRY_COMPARE(listview->count(), 25);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::onAdd()
-{
-    QFETCH(int, initialItemCount);
-    QFETCH(int, itemsToAdd);
-
-    const int delegateHeight = 10;
-    TestModel2 model;
-
-    // these initial items should not trigger ListView.onAdd
-    for (int i=0; i<initialItemCount; i++)
-        model.addItem("dummy value", "dummy value");
-
-    QQuickView *canvas = createView();
-    canvas->setGeometry(0,0,200, delegateHeight * (initialItemCount + itemsToAdd));
-    QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("delegateHeight", delegateHeight);
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("attachedSignals.qml")));
-
-    QObject *object = canvas->rootObject();
-    object->setProperty("width", canvas->width());
-    object->setProperty("height", canvas->height());
-    qApp->processEvents();
-
-    QList<QPair<QString, QString> > items;
-    for (int i=0; i<itemsToAdd; i++)
-        items << qMakePair(QString("value %1").arg(i), QString::number(i));
-    model.addItems(items);
-    QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
-
-    QVariantList result = object->property("addedDelegates").toList();
-    QCOMPARE(result.count(), items.count());
-    for (int i=0; i<items.count(); i++)
-        QCOMPARE(result[i].toString(), items[i].first);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::onAdd_data()
-{
-    QTest::addColumn<int>("initialItemCount");
-    QTest::addColumn<int>("itemsToAdd");
-
-    QTest::newRow("0, add 1") << 0 << 1;
-    QTest::newRow("0, add 2") << 0 << 2;
-    QTest::newRow("0, add 10") << 0 << 10;
-
-    QTest::newRow("1, add 1") << 1 << 1;
-    QTest::newRow("1, add 2") << 1 << 2;
-    QTest::newRow("1, add 10") << 1 << 10;
-
-    QTest::newRow("5, add 1") << 5 << 1;
-    QTest::newRow("5, add 2") << 5 << 2;
-    QTest::newRow("5, add 10") << 5 << 10;
-}
-
-void tst_QQuickListView::onRemove()
-{
-    QFETCH(int, initialItemCount);
-    QFETCH(int, indexToRemove);
-    QFETCH(int, removeCount);
-
-    const int delegateHeight = 10;
-    TestModel2 model;
-    for (int i=0; i<initialItemCount; i++)
-        model.addItem(QString("value %1").arg(i), "dummy value");
-
-    QQuickView *canvas = createView();
-    QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-    ctxt->setContextProperty("delegateHeight", delegateHeight);
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("attachedSignals.qml")));
-    QObject *object = canvas->rootObject();
-
-    model.removeItems(indexToRemove, removeCount);
-    QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
-
-    QCOMPARE(object->property("removedDelegateCount"), QVariant(removeCount));
-
-    delete canvas;
-}
-
-void tst_QQuickListView::onRemove_data()
-{
-    QTest::addColumn<int>("initialItemCount");
-    QTest::addColumn<int>("indexToRemove");
-    QTest::addColumn<int>("removeCount");
-
-    QTest::newRow("remove first") << 1 << 0 << 1;
-    QTest::newRow("two items, remove first") << 2 << 0 << 1;
-    QTest::newRow("two items, remove last") << 2 << 1 << 1;
-    QTest::newRow("two items, remove all") << 2 << 0 << 2;
-
-    QTest::newRow("four items, remove first") << 4 << 0 << 1;
-    QTest::newRow("four items, remove 0-2") << 4 << 0 << 2;
-    QTest::newRow("four items, remove 1-3") << 4 << 1 << 2;
-    QTest::newRow("four items, remove 2-4") << 4 << 2 << 2;
-    QTest::newRow("four items, remove last") << 4 << 3 << 1;
-    QTest::newRow("four items, remove all") << 4 << 0 << 4;
-
-    QTest::newRow("ten items, remove 1-8") << 10 << 0 << 8;
-    QTest::newRow("ten items, remove 2-7") << 10 << 2 << 5;
-    QTest::newRow("ten items, remove 4-10") << 10 << 4 << 6;
-}
-
-void tst_QQuickListView::rightToLeft()
-{
-    QQuickView *canvas = createView();
-    canvas->setGeometry(0,0,640,320);
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("rightToLeft.qml")));
-    qApp->processEvents();
-
-    QVERIFY(canvas->rootObject() != 0);
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "view");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QQuickVisualItemModel *model = canvas->rootObject()->findChild<QQuickVisualItemModel*>("itemModel");
-    QTRY_VERIFY(model != 0);
-
-    QTRY_VERIFY(model->count() == 3);
-    QTRY_COMPARE(listview->currentIndex(), 0);
-
-    // initial position at first item, right edge aligned
-    QCOMPARE(listview->contentX(), -640.);
-
-    QQuickItem *item = findItem<QQuickItem>(contentItem, "item1");
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(item->x(), -100.0);
-    QCOMPARE(item->height(), listview->height());
-
-    QQuickText *text = findItem<QQuickText>(contentItem, "text1");
-    QTRY_VERIFY(text);
-    QTRY_COMPARE(text->text(), QLatin1String("index: 0"));
-
-    listview->setCurrentIndex(2);
-
-    item = findItem<QQuickItem>(contentItem, "item3");
-    QTRY_VERIFY(item);
-    QTRY_COMPARE(item->x(), -540.0);
-
-    text = findItem<QQuickText>(contentItem, "text3");
-    QTRY_VERIFY(text);
-    QTRY_COMPARE(text->text(), QLatin1String("index: 2"));
-
-    QCOMPARE(listview->contentX(), -640.);
-
-    // Ensure resizing maintains position relative to right edge
-    qobject_cast<QQuickItem*>(canvas->rootObject())->setWidth(600);
-    QTRY_COMPARE(listview->contentX(), -600.);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::test_mirroring()
-{
-    QQuickView *canvasA = createView();
-    canvasA->setSource(QUrl::fromLocalFile(TESTDATA("rightToLeft.qml")));
-    QQuickListView *listviewA = findItem<QQuickListView>(canvasA->rootObject(), "view");
-    QTRY_VERIFY(listviewA != 0);
-
-    QQuickView *canvasB = createView();
-    canvasB->setSource(QUrl::fromLocalFile(TESTDATA("rightToLeft.qml")));
-    QQuickListView *listviewB = findItem<QQuickListView>(canvasB->rootObject(), "view");
-    QTRY_VERIFY(listviewA != 0);
-    qApp->processEvents();
-
-    QList<QString> objectNames;
-    objectNames << "item1" << "item2"; // << "item3"
-
-    listviewA->setProperty("layoutDirection", Qt::LeftToRight);
-    listviewB->setProperty("layoutDirection", Qt::RightToLeft);
-    QCOMPARE(listviewA->layoutDirection(), listviewA->effectiveLayoutDirection());
-
-    // LTR != RTL
-    foreach (const QString objectName, objectNames)
-        QVERIFY(findItem<QQuickItem>(listviewA, objectName)->x() != findItem<QQuickItem>(listviewB, objectName)->x());
-
-    listviewA->setProperty("layoutDirection", Qt::LeftToRight);
-    listviewB->setProperty("layoutDirection", Qt::LeftToRight);
-
-    // LTR == LTR
-    foreach (const QString objectName, objectNames)
-        QCOMPARE(findItem<QQuickItem>(listviewA, objectName)->x(), findItem<QQuickItem>(listviewB, objectName)->x());
-
-    QVERIFY(listviewB->layoutDirection() == listviewB->effectiveLayoutDirection());
-    QQuickItemPrivate::get(listviewB)->setLayoutMirror(true);
-    QVERIFY(listviewB->layoutDirection() != listviewB->effectiveLayoutDirection());
-
-    // LTR != LTR+mirror
-    foreach (const QString objectName, objectNames)
-        QVERIFY(findItem<QQuickItem>(listviewA, objectName)->x() != findItem<QQuickItem>(listviewB, objectName)->x());
-
-    listviewA->setProperty("layoutDirection", Qt::RightToLeft);
-
-    // RTL == LTR+mirror
-    foreach (const QString objectName, objectNames)
-        QCOMPARE(findItem<QQuickItem>(listviewA, objectName)->x(), findItem<QQuickItem>(listviewB, objectName)->x());
-
-    listviewB->setProperty("layoutDirection", Qt::RightToLeft);
-
-    // RTL != RTL+mirror
-    foreach (const QString objectName, objectNames)
-        QVERIFY(findItem<QQuickItem>(listviewA, objectName)->x() != findItem<QQuickItem>(listviewB, objectName)->x());
-
-    listviewA->setProperty("layoutDirection", Qt::LeftToRight);
-
-    // LTR == RTL+mirror
-    foreach (const QString objectName, objectNames)
-        QCOMPARE(findItem<QQuickItem>(listviewA, objectName)->x(), findItem<QQuickItem>(listviewB, objectName)->x());
-
-    delete canvasA;
-    delete canvasB;
-}
-
-void tst_QQuickListView::margins()
-{
-    QQuickView *canvas = createView();
-
-    TestModel2 model;
-    for (int i = 0; i < 50; i++)
-        model.addItem("Item" + QString::number(i), "");
-
-    QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("testModel", &model);
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("margins.qml")));
-    canvas->show();
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    QCOMPARE(listview->contentY(), -30.);
-    QCOMPARE(listview->yOrigin(), 0.);
-
-    // check end bound
-    listview->positionViewAtEnd();
-    qreal pos = listview->contentY();
-    listview->setContentY(pos + 80);
-    listview->returnToBounds();
-    QTRY_COMPARE(listview->contentY(), pos + 50);
-
-    // remove item before visible and check that top margin is maintained
-    // and yOrigin is updated
-    listview->setContentY(100);
-    model.removeItem(1);
-    QTest::qWait(100);
-    listview->setContentY(-50);
-    listview->returnToBounds();
-    QCOMPARE(listview->yOrigin(), 20.);
-    QTRY_COMPARE(listview->contentY(), -10.);
-
-    // reduce top margin
-    listview->setTopMargin(20);
-    QCOMPARE(listview->yOrigin(), 20.);
-    QTRY_COMPARE(listview->contentY(), 0.);
-
-    // check end bound
-    listview->positionViewAtEnd();
-    pos = listview->contentY();
-    listview->setContentY(pos + 80);
-    listview->returnToBounds();
-    QTRY_COMPARE(listview->contentY(), pos + 50);
-
-    // reduce bottom margin
-    pos = listview->contentY();
-    listview->setBottomMargin(40);
-    QCOMPARE(listview->yOrigin(), 20.);
-    QTRY_COMPARE(listview->contentY(), pos-10);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::snapToItem_data()
-{
-    QTest::addColumn<QQuickListView::Orientation>("orientation");
-    QTest::addColumn<Qt::LayoutDirection>("layoutDirection");
-    QTest::addColumn<int>("highlightRangeMode");
-    QTest::addColumn<QPoint>("flickStart");
-    QTest::addColumn<QPoint>("flickEnd");
-    QTest::addColumn<qreal>("snapAlignment");
-    QTest::addColumn<qreal>("endExtent");
-    QTest::addColumn<qreal>("startExtent");
-
-    QTest::newRow("vertical, left to right") << QQuickListView::Vertical << Qt::LeftToRight << int(QQuickItemView::NoHighlightRange)
-        << QPoint(20, 200) << QPoint(20, 20) << 60.0 << 1200.0 << 0.0;
-
-    QTest::newRow("horizontal, left to right") << QQuickListView::Horizontal << Qt::LeftToRight << int(QQuickItemView::NoHighlightRange)
-        << QPoint(200, 20) << QPoint(20, 20) << 60.0 << 1200.0 << 0.0;
-
-    QTest::newRow("horizontal, right to left") << QQuickListView::Horizontal << Qt::RightToLeft << int(QQuickItemView::NoHighlightRange)
-        << QPoint(20, 20) << QPoint(200, 20) << -60.0 << -1200.0 - 240.0 << -240.0;
-
-    QTest::newRow("vertical, left to right, enforce range") << QQuickListView::Vertical << Qt::LeftToRight << int(QQuickItemView::StrictlyEnforceRange)
-        << QPoint(20, 200) << QPoint(20, 20) << 60.0 << 1340.0 << -20.0;
-
-    QTest::newRow("horizontal, left to right, enforce range") << QQuickListView::Horizontal << Qt::LeftToRight << int(QQuickItemView::StrictlyEnforceRange)
-        << QPoint(200, 20) << QPoint(20, 20) << 60.0 << 1340.0 << -20.0;
-
-    QTest::newRow("horizontal, right to left, enforce range") << QQuickListView::Horizontal << Qt::RightToLeft << int(QQuickItemView::StrictlyEnforceRange)
-        << QPoint(20, 20) << QPoint(200, 20) << -60.0 << -1200.0 - 240.0 - 140.0 << -220.0;
-}
-
-void tst_QQuickListView::snapToItem()
-{
-    QFETCH(QQuickListView::Orientation, orientation);
-    QFETCH(Qt::LayoutDirection, layoutDirection);
-    QFETCH(int, highlightRangeMode);
-    QFETCH(QPoint, flickStart);
-    QFETCH(QPoint, flickEnd);
-    QFETCH(qreal, snapAlignment);
-    QFETCH(qreal, endExtent);
-    QFETCH(qreal, startExtent);
-
-    QQuickView *canvas = createView();
-
-    canvas->setSource(QUrl::fromLocalFile(TESTDATA("snapToItem.qml")));
-    canvas->show();
-    qApp->processEvents();
-
-    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
-
-    listview->setOrientation(orientation);
-    listview->setLayoutDirection(layoutDirection);
-    listview->setHighlightRangeMode(QQuickItemView::HighlightRangeMode(highlightRangeMode));
-
-    QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
-
-    // confirm that a flick hits an item boundary
-    flick(canvas, flickStart, flickEnd, 180);
-    QTRY_VERIFY(listview->isMoving() == false); // wait until it stops
-    if (orientation == QQuickListView::Vertical)
-        QCOMPARE(qreal(fmod(listview->contentY(),80.0)), snapAlignment);
-    else
-        QCOMPARE(qreal(fmod(listview->contentX(),80.0)), snapAlignment);
-
-    // flick to end
-    do {
-        flick(canvas, flickStart, flickEnd, 180);
-        QTRY_VERIFY(listview->isMoving() == false); // wait until it stops
-    } while (orientation == QQuickListView::Vertical
-           ? !listview->isAtYEnd()
-           : layoutDirection == Qt::LeftToRight ? !listview->isAtXEnd() : !listview->isAtXBeginning());
-
-    if (orientation == QQuickListView::Vertical)
-        QCOMPARE(listview->contentY(), endExtent);
-    else
-        QCOMPARE(listview->contentX(), endExtent);
-
-    // flick to start
-    do {
-        flick(canvas, flickEnd, flickStart, 180);
-        QTRY_VERIFY(listview->isMoving() == false); // wait until it stops
-    } while (orientation == QQuickListView::Vertical
-           ? !listview->isAtYBeginning()
-           : layoutDirection == Qt::LeftToRight ? !listview->isAtXBeginning() : !listview->isAtXEnd());
-
-    if (orientation == QQuickListView::Vertical)
-        QCOMPARE(listview->contentY(), startExtent);
-    else
-        QCOMPARE(listview->contentX(), startExtent);
-
-    delete canvas;
-}
-
-void tst_QQuickListView::qListModelInterface_items()
-{
-    items<TestModel>();
-}
-
-void tst_QQuickListView::qAbstractItemModel_items()
-{
-    items<TestModel2>();
-}
-
-void tst_QQuickListView::qListModelInterface_changed()
-{
-    changed<TestModel>();
-}
-
-void tst_QQuickListView::qAbstractItemModel_changed()
-{
-    changed<TestModel2>();
-}
-
-void tst_QQuickListView::qListModelInterface_inserted()
-{
-    inserted<TestModel>();
-}
-
-void tst_QQuickListView::qListModelInterface_inserted_more()
-{
-    inserted_more<TestModel>();
-}
-
-void tst_QQuickListView::qListModelInterface_inserted_more_data()
-{
-    inserted_more_data();
-}
-
-void tst_QQuickListView::qAbstractItemModel_inserted()
-{
-    inserted<TestModel2>();
-}
-
-void tst_QQuickListView::qAbstractItemModel_inserted_more()
-{
-    inserted_more<TestModel2>();
-}
-
-void tst_QQuickListView::qAbstractItemModel_inserted_more_data()
-{
-    inserted_more_data();
-}
-
-void tst_QQuickListView::qListModelInterface_removed()
-{
-    removed<TestModel>(false);
-    removed<TestModel>(true);
-}
-
-void tst_QQuickListView::qAbstractItemModel_removed()
-{
-    removed<TestModel2>(false);
-    removed<TestModel2>(true);
-}
-
-void tst_QQuickListView::qListModelInterface_moved()
-{
-    moved<TestModel>();
-}
-
-void tst_QQuickListView::qListModelInterface_moved_data()
-{
-    moved_data();
-}
-
-void tst_QQuickListView::qAbstractItemModel_moved()
-{
-    moved<TestModel2>();
-}
-
-void tst_QQuickListView::qAbstractItemModel_moved_data()
-{
-    moved_data();
-}
-
-void tst_QQuickListView::qListModelInterface_clear()
-{
-    clear<TestModel>();
-}
-
-void tst_QQuickListView::qAbstractItemModel_clear()
-{
-    clear<TestModel2>();
-}
-
-void tst_QQuickListView::creationContext()
-{
-    QQuickView canvas;
-    canvas.setGeometry(0,0,240,320);
-    canvas.setSource(QUrl::fromLocalFile(TESTDATA("creationContext.qml")));
-    qApp->processEvents();
-
-    QQuickItem *rootItem = qobject_cast<QQuickItem *>(canvas.rootObject());
-    QVERIFY(rootItem);
-    QVERIFY(rootItem->property("count").toInt() > 0);
-
-    QQuickItem *item;
-    QVERIFY(item = rootItem->findChild<QQuickItem *>("listItem"));
-    QCOMPARE(item->property("text").toString(), QString("Hello!"));
-    QVERIFY(item = rootItem->findChild<QQuickItem *>("header"));
-    QCOMPARE(item->property("text").toString(), QString("Hello!"));
-    QVERIFY(item = rootItem->findChild<QQuickItem *>("footer"));
-    QCOMPARE(item->property("text").toString(), QString("Hello!"));
-    QVERIFY(item = rootItem->findChild<QQuickItem *>("section"));
-    QCOMPARE(item->property("text").toString(), QString("Hello!"));
-}
-
-void tst_QQuickListView::QTBUG_21742()
-{
-    QQuickView canvas;
-    canvas.setGeometry(0,0,200,200);
-    canvas.setSource(QUrl::fromLocalFile(TESTDATA("qtbug-21742.qml")));
-    qApp->processEvents();
-
-    QQuickItem *rootItem = qobject_cast<QQuickItem *>(canvas.rootObject());
-    QVERIFY(rootItem);
-    QCOMPARE(rootItem->property("count").toInt(), 1);
-}
-
-QQuickView *tst_QQuickListView::createView()
-{
-    QQuickView *canvas = new QQuickView(0);
-    canvas->setGeometry(0,0,240,320);
-
-    return canvas;
-}
-
-void tst_QQuickListView::flick(QQuickView *canvas, const QPoint &from, const QPoint &to, int duration)
-{
-    const int pointCount = 5;
-    QPoint diff = to - from;
-
-    // send press, five equally spaced moves, and release.
-    QTest::mousePress(canvas, Qt::LeftButton, 0, from);
-
-    for (int i = 0; i < pointCount; ++i) {
-        QMouseEvent mv(QEvent::MouseMove, from + (i+1)*diff/pointCount, Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
-        QApplication::sendEvent(canvas, &mv);
-        QTest::qWait(duration/pointCount);
-        QCoreApplication::processEvents();
-    }
-
-    QTest::mouseRelease(canvas, Qt::LeftButton, 0, to);
-}
-
-void tst_QQuickListView::asynchronous()
-{
-    QQuickView *canvas = createView();
-    canvas->show();
-    QDeclarativeIncubationController controller;
-    canvas->engine()->setIncubationController(&controller);
-
-    canvas->setSource(TESTDATA("asyncloader.qml"));
-
-    QQuickItem *rootObject = qobject_cast<QQuickItem*>(canvas->rootObject());
-    QVERIFY(rootObject);
-
-    QQuickListView *listview = 0;
-    while (!listview) {
-        bool b = false;
-        controller.incubateWhile(&b);
-        listview = rootObject->findChild<QQuickListView*>("view");
-    }
-
-    // items will be created one at a time
-    for (int i = 0; i < 8; ++i) {
-        QVERIFY(findItem<QQuickItem>(listview, "wrapper", i) == 0);
-        QQuickItem *item = 0;
-        while (!item) {
-            bool b = false;
-            controller.incubateWhile(&b);
-            item = findItem<QQuickItem>(listview, "wrapper", i);
-        }
-    }
-
-    {
-        bool b = true;
-        controller.incubateWhile(&b);
-    }
-
-    // verify positioning
-    QQuickItem *contentItem = listview->contentItem();
-    for (int i = 0; i < 8; ++i) {
-        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QTRY_COMPARE(item->y(), i*50.0);
-    }
-
-    delete canvas;
-}
-
-QQuickItem *tst_QQuickListView::findVisibleChild(QQuickItem *parent, const QString &objectName)
-{
-    QQuickItem *item = 0;
-    QList<QQuickItem*> items = parent->findChildren<QQuickItem*>(objectName);
-    for (int i = 0; i < items.count(); ++i) {
-        if (items.at(i)->isVisible()) {
-            item = items.at(i);
-            break;
-        }
-    }
-    return item;
-}
-/*
-   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_QQuickListView::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;
-}
-
-template<typename T>
-QList<T*> tst_QQuickListView::findItems(QQuickItem *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) {
-        QQuickItem *item = qobject_cast<QQuickItem*>(parent->childItems().at(i));
-        if (!item || !item->isVisible())
-            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_QQuickListView::dumpTree(QQuickItem *parent, int depth)
-{
-    static QString padding("                       ");
-    for (int i = 0; i < parent->childItems().count(); ++i) {
-        QQuickItem *item = qobject_cast<QQuickItem*>(parent->childItems().at(i));
-        if (!item)
-            continue;
-        qDebug() << padding.left(depth*2) << item;
-        dumpTree(item, depth+1);
-    }
-}
-
-QTEST_MAIN(tst_QQuickListView)
-
-#include "tst_qquicklistview.moc"
-