Rename Qt Quick-specific classes to QQuick*

[profile/ivi/qtdeclarative.git] / tests / auto / declarative / qquicklistview / tst_qquicklistview.cpp

diff --git a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp b/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp
similarity index 78%
rename from tests/auto/declarative/qsglistview/tst_qsglistview.cpp
rename to tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp
index 8e2375d..ae37724 100644 (file)
--- a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp
+++ b/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp
@@ -41,14 +41,14 @@
 
 #include <QtTest/QtTest>
 #include <QtWidgets/QStringListModel>
-#include <QtDeclarative/qsgview.h>
+#include <QtDeclarative/qquickview.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtDeclarative/qdeclarativeexpression.h>
-#include <QtDeclarative/private/qsgitem_p.h>
-#include <QtDeclarative/private/qsglistview_p.h>
-#include <QtDeclarative/private/qsgtext_p.h>
-#include <QtDeclarative/private/qsgvisualitemmodel_p.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>
@@ -57,13 +57,13 @@
 #include <math.h>
 
 Q_DECLARE_METATYPE(Qt::LayoutDirection)
-Q_DECLARE_METATYPE(QSGListView::Orientation)
+Q_DECLARE_METATYPE(QQuickListView::Orientation)
 
-class tst_QSGListView : public QObject
+class tst_QQuickListView : public QObject
 {
     Q_OBJECT
 public:
-    tst_QSGListView();
+    tst_QQuickListView();
 
 private slots:
     void initTestCase();
@@ -153,24 +153,24 @@ private:
     template <class T> void removed(bool animated);
     template <class T> void moved();
     template <class T> void clear();
-    QSGView *createView();
-    void flick(QSGView *canvas, const QPoint &from, const QPoint &to, int duration);
-    QSGItem *findVisibleChild(QSGItem *parent, const QString &objectName);
+    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(QSGItem *parent, const QString &id, int index=-1);
+    T *findItem(QQuickItem *parent, const QString &id, int index=-1);
     template<typename T>
-    QList<T*> findItems(QSGItem *parent, const QString &objectName);
-    void dumpTree(QSGItem *parent, int depth = 0);
+    QList<T*> findItems(QQuickItem *parent, const QString &objectName);
+    void dumpTree(QQuickItem *parent, int depth = 0);
 
     void inserted_more_data();
     void moved_data();
 };
 
-void tst_QSGListView::initTestCase()
+void tst_QQuickListView::initTestCase()
 {
 }
 
-void tst_QSGListView::cleanupTestCase()
+void tst_QQuickListView::cleanupTestCase()
 {
 
 }
@@ -214,7 +214,7 @@ public:
 };
 
 template<typename T>
-void tst_qsglistview_move(int from, int to, int n, T *items)
+void tst_qquicklistview_move(int from, int to, int n, T *items)
 {
     if (from > to) {
         // Only move forwards - flip if backwards moving
@@ -332,7 +332,7 @@ public:
     }
 
     void moveItems(int from, int to, int count) {
-        tst_qsglistview_move(from, to, count, &list);
+        tst_qquicklistview_move(from, to, count, &list);
         emit itemsMoved(from, to, count);
     }
 
@@ -426,7 +426,7 @@ public:
 
     void moveItems(int from, int to, int count) {
         emit beginMoveRows(QModelIndex(), from, from+count-1, QModelIndex(), to > from ? to+count : to);
-        tst_qsglistview_move(from, to, count, &list);
+        tst_qquicklistview_move(from, to, count, &list);
         emit endMoveRows();
     }
 
@@ -446,14 +446,14 @@ private:
     QList<QPair<QString,QString> > list;
 };
 
-tst_QSGListView::tst_QSGListView()
+tst_QQuickListView::tst_QQuickListView()
 {
 }
 
 template <class T>
-void tst_QSGListView::items()
+void tst_QQuickListView::items()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     T model;
     model.addItem("Fred", "12345");
@@ -469,10 +469,10 @@ void tst_QSGListView::items()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
@@ -484,13 +484,13 @@ void tst_QSGListView::items()
     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<QSGItem>(contentItem, "wrapper", 0));
+    QTRY_COMPARE(listview->currentItem(), findItem<QQuickItem>(contentItem, "wrapper", 0));
 
     for (int i = 0; i < model.count(); ++i) {
-        QSGText *name = findItem<QSGText>(contentItem, "textName", i);
+        QQuickText *name = findItem<QQuickText>(contentItem, "textName", i);
         QTRY_VERIFY(name != 0);
         QTRY_COMPARE(name->text(), model.name(i));
-        QSGText *number = findItem<QSGText>(contentItem, "textNumber", i);
+        QQuickText *number = findItem<QQuickText>(contentItem, "textNumber", i);
         QTRY_VERIFY(number != 0);
         QTRY_COMPARE(number->text(), model.number(i));
     }
@@ -519,7 +519,7 @@ void tst_QSGListView::items()
     T model2;
     ctxt->setContextProperty("testModel", &model2);
 
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     QTRY_VERIFY(itemCount == 0);
 
     QTRY_COMPARE(listview->highlightResizeSpeed(), 1000.0);
@@ -531,9 +531,9 @@ void tst_QSGListView::items()
 
 
 template <class T>
-void tst_QSGListView::changed()
+void tst_QQuickListView::changed()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     T model;
     model.addItem("Fred", "12345");
@@ -549,17 +549,17 @@ void tst_QSGListView::changed()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGFlickable *listview = findItem<QSGFlickable>(canvas->rootObject(), "list");
+    QQuickFlickable *listview = findItem<QQuickFlickable>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     model.modifyItem(1, "Will", "9876");
-    QSGText *name = findItem<QSGText>(contentItem, "textName", 1);
+    QQuickText *name = findItem<QQuickText>(contentItem, "textName", 1);
     QTRY_VERIFY(name != 0);
     QTRY_COMPARE(name->text(), model.name(1));
-    QSGText *number = findItem<QSGText>(contentItem, "textNumber", 1);
+    QQuickText *number = findItem<QQuickText>(contentItem, "textNumber", 1);
     QTRY_VERIFY(number != 0);
     QTRY_COMPARE(number->text(), model.number(1));
 
@@ -568,9 +568,9 @@ void tst_QSGListView::changed()
 }
 
 template <class T>
-void tst_QSGListView::inserted()
+void tst_QQuickListView::inserted()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
 
     T model;
@@ -587,10 +587,10 @@ void tst_QSGListView::inserted()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     model.insertItem(1, "Will", "9876");
@@ -598,16 +598,16 @@ void tst_QSGListView::inserted()
     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
 
-    QSGText *name = findItem<QSGText>(contentItem, "textName", 1);
+    QQuickText *name = findItem<QQuickText>(contentItem, "textName", 1);
     QTRY_VERIFY(name != 0);
     QTRY_COMPARE(name->text(), model.name(1));
-    QSGText *number = findItem<QSGText>(contentItem, "textNumber", 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) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         QTRY_COMPARE(item->y(), i*20.0);
     }
 
@@ -616,10 +616,10 @@ void tst_QSGListView::inserted()
     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<QSGText>(contentItem, "textName", 0);
+    name = findItem<QQuickText>(contentItem, "textName", 0);
     QTRY_VERIFY(name != 0);
     QTRY_COMPARE(name->text(), model.name(0));
-    number = findItem<QSGText>(contentItem, "textNumber", 0);
+    number = findItem<QQuickText>(contentItem, "textNumber", 0);
     QTRY_VERIFY(number != 0);
     QTRY_COMPARE(number->text(), model.number(0));
 
@@ -627,7 +627,7 @@ void tst_QSGListView::inserted()
 
     // Confirm items positioned correctly
     for (int i = 0; i < model.count(); ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         QTRY_COMPARE(item->y(), i*20.0);
     }
 
@@ -643,7 +643,7 @@ void tst_QSGListView::inserted()
 
     // Confirm items positioned correctly
     for (int i = 5; i < 5+15; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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);
@@ -656,7 +656,7 @@ void tst_QSGListView::inserted()
     model.insertItem(0, "Hello", "1234");
     QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
 
-    QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 0);
+    QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 0);
     QVERIFY(item);
     QCOMPARE(item->y(), 0.);
     QVERIFY(listview->contentY() == 0);
@@ -666,16 +666,16 @@ void tst_QSGListView::inserted()
 }
 
 template <class T>
-void tst_QSGListView::inserted_more()
+void tst_QQuickListView::inserted_more()
 {
     QFETCH(qreal, contentY);
     QFETCH(int, insertIndex);
     QFETCH(int, insertCount);
     QFETCH(qreal, itemsOffsetAfterMove);
 
-    QSGText *name;
-    QSGText *number;
-    QSGView *canvas = createView();
+    QQuickText *name;
+    QQuickText *number;
+    QQuickView *canvas = createView();
     canvas->show();
 
     T model;
@@ -691,9 +691,9 @@ void tst_QSGListView::inserted_more()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     listview->setContentY(contentY);
@@ -705,11 +705,11 @@ void tst_QSGListView::inserted_more()
     QTRY_COMPARE(listview->property("count").toInt(), model.count());
 
     // check visibleItems.first() is in correct position
-    QSGItem *item0 = findItem<QSGItem>(contentItem, "wrapper", 0);
+    QQuickItem *item0 = findItem<QQuickItem>(contentItem, "wrapper", 0);
     QVERIFY(item0);
     QCOMPARE(item0->y(), itemsOffsetAfterMove);
 
-    QList<QSGItem*> items = findItems<QSGItem>(contentItem, "wrapper");
+    QList<QQuickItem*> items = findItems<QQuickItem>(contentItem, "wrapper");
     int firstVisibleIndex = -1;
     for (int i=0; i<items.count(); i++) {
         if (items[i]->y() >= contentY) {
@@ -721,15 +721,15 @@ void tst_QSGListView::inserted_more()
     QVERIFY2(firstVisibleIndex >= 0, QTest::toString(firstVisibleIndex));
 
     // Confirm items positioned correctly and indexes correct
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = firstVisibleIndex; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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<QSGText>(contentItem, "textName", i);
+        name = findItem<QQuickText>(contentItem, "textName", i);
         QVERIFY(name != 0);
         QTRY_COMPARE(name->text(), model.name(i));
-        number = findItem<QSGText>(contentItem, "textNumber", i);
+        number = findItem<QQuickText>(contentItem, "textNumber", i);
         QVERIFY(number != 0);
         QTRY_COMPARE(number->text(), model.number(i));
     }
@@ -738,7 +738,7 @@ void tst_QSGListView::inserted_more()
     delete testObject;
 }
 
-void tst_QSGListView::inserted_more_data()
+void tst_QQuickListView::inserted_more_data()
 {
     QTest::addColumn<qreal>("contentY");
     QTest::addColumn<int>("insertIndex");
@@ -819,9 +819,9 @@ void tst_QSGListView::inserted_more_data()
 }
 
 template <class T>
-void tst_QSGListView::removed(bool animated)
+void tst_QQuickListView::removed(bool animated)
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     T model;
     for (int i = 0; i < 50; i++)
@@ -837,26 +837,26 @@ void tst_QSGListView::removed(bool animated)
     canvas->show();
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     model.removeItem(1);
     QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
 
-    QSGText *name = findItem<QSGText>(contentItem, "textName", 1);
+    QQuickText *name = findItem<QQuickText>(contentItem, "textName", 1);
     QTRY_VERIFY(name != 0);
     QTRY_COMPARE(name->text(), model.name(1));
-    QSGText *number = findItem<QSGText>(contentItem, "textNumber", 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<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
         QTRY_VERIFY(item->y() == i*20);
@@ -866,17 +866,17 @@ void tst_QSGListView::removed(bool animated)
     model.removeItem(0);  // post: top item starts at 20
     QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
 
-    name = findItem<QSGText>(contentItem, "textName", 0);
+    name = findItem<QQuickText>(contentItem, "textName", 0);
     QTRY_VERIFY(name != 0);
     QTRY_COMPARE(name->text(), model.name(0));
-    number = findItem<QSGText>(contentItem, "textNumber", 0);
+    number = findItem<QQuickText>(contentItem, "textNumber", 0);
     QTRY_VERIFY(number != 0);
     QTRY_COMPARE(number->text(), model.number(0));
 
     // Confirm items positioned correctly
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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);
@@ -887,9 +887,9 @@ void tst_QSGListView::removed(bool animated)
     QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
 
     // Confirm items positioned correctly
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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);
@@ -904,7 +904,7 @@ void tst_QSGListView::removed(bool animated)
 
     // Confirm items positioned correctly
     for (int i = 2; i < 18; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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);
@@ -912,7 +912,7 @@ void tst_QSGListView::removed(bool animated)
 
     // Remove current index
     QTRY_VERIFY(listview->currentIndex() == 9);
-    QSGItem *oldCurrent = listview->currentItem();
+    QQuickItem *oldCurrent = listview->currentItem();
     model.removeItem(9);
 
     QTRY_COMPARE(listview->currentIndex(), 9);
@@ -923,9 +923,9 @@ void tst_QSGListView::removed(bool animated)
     QTest::qWait(300);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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);
@@ -955,9 +955,9 @@ void tst_QSGListView::removed(bool animated)
     QTRY_COMPARE(listview->count() , model.count());
 
     // Confirm items positioned correctly
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i+2);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i+2);
         if (!item) qWarning() << "Item" << i+2 << "not found";
         QTRY_VERIFY(item);
         QTRY_COMPARE(item->y(),80+i*20.0);
@@ -972,7 +972,7 @@ void tst_QSGListView::removed(bool animated)
     model.addItem("New", "1");
     QTRY_COMPARE(listview->count() , model.count());
 
-    QTRY_VERIFY(name = findItem<QSGText>(contentItem, "textName", model.count()-1));
+    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
@@ -984,22 +984,22 @@ void tst_QSGListView::removed(bool animated)
     listview->setCurrentIndex(0);
     listview->setContentY(30);
     model.removeItem(0);
-    QTRY_VERIFY(name = findItem<QSGText>(contentItem, "textName", 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<QSGItem>(contentItem, "wrapper").count() > 16);
+    QTRY_VERIFY(findItems<QQuickItem>(contentItem, "wrapper").count() > 16);
 
     delete canvas;
     delete testObject;
 }
 
 template <class T>
-void tst_QSGListView::clear()
+void tst_QQuickListView::clear()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     T model;
     for (int i = 0; i < 30; i++)
@@ -1014,10 +1014,10 @@ void tst_QSGListView::clear()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     model.clear();
@@ -1038,7 +1038,7 @@ void tst_QSGListView::clear()
 }
 
 template <class T>
-void tst_QSGListView::moved()
+void tst_QQuickListView::moved()
 {
     QFETCH(qreal, contentY);
     QFETCH(int, from);
@@ -1046,9 +1046,9 @@ void tst_QSGListView::moved()
     QFETCH(int, count);
     QFETCH(qreal, itemsOffsetAfterMove);
 
-    QSGText *name;
-    QSGText *number;
-    QSGView *canvas = createView();
+    QQuickText *name;
+    QQuickText *number;
+    QQuickView *canvas = createView();
     canvas->show();
 
     T model;
@@ -1064,13 +1064,13 @@ void tst_QSGListView::moved()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
-    QSGItem *currentItem = listview->currentItem();
+    QQuickItem *currentItem = listview->currentItem();
     QTRY_VERIFY(currentItem != 0);
 
     listview->setContentY(contentY);
@@ -1079,7 +1079,7 @@ void tst_QSGListView::moved()
     // wait for items to move
     QTest::qWait(100);
 
-    QList<QSGItem*> items = findItems<QSGItem>(contentItem, "wrapper");
+    QList<QQuickItem*> items = findItems<QQuickItem>(contentItem, "wrapper");
     int firstVisibleIndex = -1;
     for (int i=0; i<items.count(); i++) {
         if (items[i]->y() >= contentY) {
@@ -1091,17 +1091,17 @@ void tst_QSGListView::moved()
     QVERIFY2(firstVisibleIndex >= 0, QTest::toString(firstVisibleIndex));
 
     // Confirm items positioned correctly and indexes correct
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    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;
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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<QSGText>(contentItem, "textName", i);
+        name = findItem<QQuickText>(contentItem, "textName", i);
         QVERIFY(name != 0);
         QTRY_COMPARE(name->text(), model.name(i));
-        number = findItem<QSGText>(contentItem, "textNumber", i);
+        number = findItem<QQuickText>(contentItem, "textNumber", i);
         QVERIFY(number != 0);
         QTRY_COMPARE(number->text(), model.number(i));
 
@@ -1114,7 +1114,7 @@ void tst_QSGListView::moved()
     delete testObject;
 }
 
-void tst_QSGListView::moved_data()
+void tst_QQuickListView::moved_data()
 {
     QTest::addColumn<qreal>("contentY");
     QTest::addColumn<int>("from");
@@ -1254,14 +1254,14 @@ struct ListChange {
 };
 Q_DECLARE_METATYPE(QList<ListChange>)
 
-void tst_QSGListView::multipleChanges()
+void tst_QQuickListView::multipleChanges()
 {
     QFETCH(int, startCount);
     QFETCH(QList<ListChange>, changes);
     QFETCH(int, newCount);
     QFETCH(int, newCurrentIndex);
 
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
 
     TestModel model;
@@ -1277,7 +1277,7 @@ void tst_QSGListView::multipleChanges()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
     for (int i=0; i<changes.count(); i++) {
@@ -1306,18 +1306,18 @@ void tst_QSGListView::multipleChanges()
     QCOMPARE(listview->count(), model.count());
     QTRY_COMPARE(listview->currentIndex(), newCurrentIndex);
 
-    QSGText *name;
-    QSGText *number;
-    QSGItem *contentItem = listview->contentItem();
+    QQuickText *name;
+    QQuickText *number;
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i=0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         QVERIFY2(item, QTest::toString(QString("Item %1 not found").arg(i)));
-        name = findItem<QSGText>(contentItem, "textName", i);
+        name = findItem<QQuickText>(contentItem, "textName", i);
         QVERIFY(name != 0);
         QTRY_COMPARE(name->text(), model.name(i));
-        number = findItem<QSGText>(contentItem, "textNumber", i);
+        number = findItem<QQuickText>(contentItem, "textNumber", i);
         QVERIFY(number != 0);
         QTRY_COMPARE(number->text(), model.number(i));
     }
@@ -1326,7 +1326,7 @@ void tst_QSGListView::multipleChanges()
     delete canvas;
 }
 
-void tst_QSGListView::multipleChanges_data()
+void tst_QQuickListView::multipleChanges_data()
 {
     QTest::addColumn<int>("startCount");
     QTest::addColumn<QList<ListChange> >("changes");
@@ -1476,9 +1476,9 @@ void tst_QSGListView::multipleChanges_data()
             ) << 5 << -1;
 }
 
-void tst_QSGListView::swapWithFirstItem()
+void tst_QQuickListView::swapWithFirstItem()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
 
     TestModel model;
@@ -1494,7 +1494,7 @@ void tst_QSGListView::swapWithFirstItem()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
     // ensure content position is stable
@@ -1506,9 +1506,9 @@ void tst_QSGListView::swapWithFirstItem()
     delete canvas;
 }
 
-void tst_QSGListView::enforceRange()
+void tst_QQuickListView::enforceRange()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -1520,25 +1520,25 @@ void tst_QSGListView::enforceRange()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listview-enforcerange.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    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(), QSGListView::StrictlyEnforceRange);
+    QTRY_COMPARE(listview->highlightRangeMode(), QQuickListView::StrictlyEnforceRange);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     // view should be positioned at the top of the range.
-    QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 0);
+    QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 0);
     QTRY_VERIFY(item);
     QTRY_COMPARE(listview->contentY(), -100.0);
 
-    QSGText *name = findItem<QSGText>(contentItem, "textName", 0);
+    QQuickText *name = findItem<QQuickText>(contentItem, "textName", 0);
     QTRY_VERIFY(name != 0);
     QTRY_COMPARE(name->text(), model.name(0));
-    QSGText *number = findItem<QSGText>(contentItem, "textNumber", 0);
+    QQuickText *number = findItem<QQuickText>(contentItem, "textNumber", 0);
     QTRY_VERIFY(number != 0);
     QTRY_COMPARE(number->text(), model.number(0));
 
@@ -1558,14 +1558,14 @@ void tst_QSGListView::enforceRange()
     delete canvas;
 }
 
-void tst_QSGListView::enforceRange_withoutHighlight()
+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()
 
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
     QTest::qWait(200);
 
@@ -1581,7 +1581,7 @@ void tst_QSGListView::enforceRange_withoutHighlight()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listview-enforcerange-nohighlight.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
     qreal expectedPos = -100.0;
@@ -1605,9 +1605,9 @@ void tst_QSGListView::enforceRange_withoutHighlight()
     delete canvas;
 }
 
-void tst_QSGListView::spacing()
+void tst_QQuickListView::spacing()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
 
     TestModel model;
@@ -1623,16 +1623,16 @@ void tst_QSGListView::spacing()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
         QTRY_VERIFY(item->y() == i*20);
@@ -1642,9 +1642,9 @@ void tst_QSGListView::spacing()
     QTRY_VERIFY(listview->spacing() == 10);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
         QTRY_VERIFY(item->y() == i*30);
@@ -1653,9 +1653,9 @@ void tst_QSGListView::spacing()
     listview->setSpacing(0);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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);
@@ -1665,9 +1665,9 @@ void tst_QSGListView::spacing()
     delete testObject;
 }
 
-void tst_QSGListView::sections()
+void tst_QQuickListView::sections()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
 
     TestModel model;
@@ -1680,19 +1680,19 @@ void tst_QSGListView::sections()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listview-sections.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         QTRY_VERIFY(item);
         QTRY_COMPARE(item->y(), qreal(i*20 + ((i+4)/5) * 20));
-        QSGText *next = findItem<QSGText>(item, "nextSection");
+        QQuickText *next = findItem<QQuickText>(item, "nextSection");
         QCOMPARE(next->text().toInt(), (i+1)/5);
     }
 
@@ -1703,7 +1703,7 @@ void tst_QSGListView::sections()
     QTRY_COMPARE(listview->count(), model.count());
 
     // New section header created
-    QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 5);
+    QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 5);
     QTRY_VERIFY(item);
     QTRY_COMPARE(item->height(), 40.0);
 
@@ -1711,11 +1711,11 @@ void tst_QSGListView::sections()
     QTRY_COMPARE(listview->count(), model.count());
 
     // Section header moved
-    item = findItem<QSGItem>(contentItem, "wrapper", 5);
+    item = findItem<QQuickItem>(contentItem, "wrapper", 5);
     QTRY_VERIFY(item);
     QTRY_COMPARE(item->height(), 20.0);
 
-    item = findItem<QSGItem>(contentItem, "wrapper", 6);
+    item = findItem<QQuickItem>(contentItem, "wrapper", 6);
     QTRY_VERIFY(item);
     QTRY_COMPARE(item->height(), 40.0);
 
@@ -1723,11 +1723,11 @@ void tst_QSGListView::sections()
     model.insertItem(6, "Replace header", "1");
     QTRY_COMPARE(listview->count(), model.count());
 
-    item = findItem<QSGItem>(contentItem, "wrapper", 6);
+    item = findItem<QQuickItem>(contentItem, "wrapper", 6);
     QTRY_VERIFY(item);
     QTRY_COMPARE(item->height(), 40.0);
 
-    item = findItem<QSGItem>(contentItem, "wrapper", 7);
+    item = findItem<QQuickItem>(contentItem, "wrapper", 7);
     QTRY_VERIFY(item);
     QTRY_COMPARE(item->height(), 20.0);
 
@@ -1743,7 +1743,7 @@ void tst_QSGListView::sections()
 
     QTRY_COMPARE(currentSectionChangedSpy.count(), 2);
 
-    item = findItem<QSGItem>(contentItem, "wrapper", 1);
+    item = findItem<QQuickItem>(contentItem, "wrapper", 1);
     QTRY_VERIFY(item);
     QTRY_COMPARE(item->height(), 20.0);
 
@@ -1752,16 +1752,16 @@ void tst_QSGListView::sections()
     model.modifyItem(0, "changed", "2");
     QTest::qWait(300);
 
-    item = findItem<QSGItem>(contentItem, "wrapper", 1);
+    item = findItem<QQuickItem>(contentItem, "wrapper", 1);
     QTRY_VERIFY(item);
     QTRY_COMPARE(item->height(), 40.0);
 
     delete canvas;
 }
 
-void tst_QSGListView::sectionsDelegate()
+void tst_QQuickListView::sectionsDelegate()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
 
     TestModel model;
@@ -1774,24 +1774,24 @@ void tst_QSGListView::sectionsDelegate()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listview-sections_delegate.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         QTRY_VERIFY(item);
         QTRY_COMPARE(item->y(), qreal(i*20 + ((i+5)/5) * 20));
-        QSGText *next = findItem<QSGText>(item, "nextSection");
+        QQuickText *next = findItem<QQuickText>(item, "nextSection");
         QCOMPARE(next->text().toInt(), (i+1)/5);
     }
 
     for (int i = 0; i < 3; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "sect_" + QString::number(i));
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "sect_" + QString::number(i));
         QVERIFY(item);
         QTRY_COMPARE(item->y(), qreal(i*20*6));
     }
@@ -1804,7 +1804,7 @@ void tst_QSGListView::sectionsDelegate()
     QTest::qWait(300);
 
     for (int i = 0; i < 3; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem,
+        QQuickItem *item = findItem<QQuickItem>(contentItem,
                 "sect_" + (i == 0 ? QString("aaa") : QString::number(i)));
         QVERIFY(item);
         QTRY_COMPARE(item->y(), qreal(i*20*6));
@@ -1814,13 +1814,13 @@ void tst_QSGListView::sectionsDelegate()
     model.removeItem(5);
     QTRY_COMPARE(listview->count(), model.count());
     for (int i = 0; i < 3; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem,
+        QQuickItem *item = findItem<QQuickItem>(contentItem,
                 "sect_" + (i == 0 ? QString("aaa") : QString::number(i)));
         QVERIFY(item);
     }
 
     // QTBUG-17606
-    QList<QSGItem*> items = findItems<QSGItem>(contentItem, "sect_1");
+    QList<QQuickItem*> items = findItems<QQuickItem>(contentItem, "sect_1");
     QCOMPARE(items.count(), 1);
 
     // QTBUG-17759
@@ -1836,12 +1836,12 @@ void tst_QSGListView::sectionsDelegate()
     model.modifyItem(9, "Two", "aaa");
     model.modifyItem(10, "Two", "aaa");
     model.modifyItem(11, "Two", "aaa");
-    QTRY_COMPARE(findItems<QSGItem>(contentItem, "sect_aaa").count(), 1);
+    QTRY_COMPARE(findItems<QQuickItem>(contentItem, "sect_aaa").count(), 1);
     canvas->rootObject()->setProperty("sectionProperty", "name");
     // ensure view has settled.
-    QTRY_COMPARE(findItems<QSGItem>(contentItem, "sect_Four").count(), 1);
+    QTRY_COMPARE(findItems<QQuickItem>(contentItem, "sect_Four").count(), 1);
     for (int i = 0; i < 4; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem,
+        QQuickItem *item = findItem<QQuickItem>(contentItem,
                 "sect_" + model.name(i*3));
         QVERIFY(item);
         QTRY_COMPARE(item->y(), qreal(i*20*4));
@@ -1850,7 +1850,7 @@ void tst_QSGListView::sectionsDelegate()
     // QTBUG-17769
     model.removeItems(10, 20);
     // ensure view has settled.
-    QTRY_COMPARE(findItems<QSGItem>(contentItem, "wrapper").count(), 10);
+    QTRY_COMPARE(findItems<QQuickItem>(contentItem, "wrapper").count(), 10);
     // Drag view up beyond bounds
     QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(20,20));
     {
@@ -1872,9 +1872,9 @@ void tst_QSGListView::sectionsDelegate()
     delete canvas;
 }
 
-void tst_QSGListView::sectionsPositioning()
+void tst_QQuickListView::sectionsPositioning()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
 
     TestModel model;
@@ -1886,25 +1886,25 @@ void tst_QSGListView::sectionsPositioning()
 
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listview-sections_delegate.qml")));
     qApp->processEvents();
-    canvas->rootObject()->setProperty("sectionPositioning", QVariant(int(QSGViewSection::InlineLabels | QSGViewSection::CurrentLabelAtStart | QSGViewSection::NextLabelAtEnd)));
+    canvas->rootObject()->setProperty("sectionPositioning", QVariant(int(QQuickViewSection::InlineLabels | QQuickViewSection::CurrentLabelAtStart | QQuickViewSection::NextLabelAtEnd)));
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     for (int i = 0; i < 3; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "sect_" + QString::number(i));
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "sect_" + QString::number(i));
         QVERIFY(item);
         QTRY_COMPARE(item->y(), qreal(i*20*6));
     }
 
-    QSGItem *topItem = findVisibleChild(contentItem, "sect_0"); // section header
+    QQuickItem *topItem = findVisibleChild(contentItem, "sect_0"); // section header
     QVERIFY(topItem);
     QCOMPARE(topItem->y(), 0.);
 
-    QSGItem *bottomItem = findVisibleChild(contentItem, "sect_3"); // section footer
+    QQuickItem *bottomItem = findVisibleChild(contentItem, "sect_3"); // section footer
     QVERIFY(bottomItem);
     QCOMPARE(bottomItem->y(), 300.);
 
@@ -1918,7 +1918,7 @@ void tst_QSGListView::sectionsPositioning()
     QVERIFY(topItem);
     QCOMPARE(topItem->y(), 100.);
 
-    QSGItem *item = findVisibleChild(contentItem, "sect_1");
+    QQuickItem *item = findVisibleChild(contentItem, "sect_1");
     QVERIFY(item);
     QCOMPARE(item->y(), 120.);
 
@@ -1949,7 +1949,7 @@ void tst_QSGListView::sectionsPositioning()
     QTRY_COMPARE(listview->currentSection(), QString("aaa"));
 
     for (int i = 0; i < 3; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem,
+        QQuickItem *item = findItem<QQuickItem>(contentItem,
                 "sect_" + (i == 0 ? QString("aaa") : QString::number(i)));
         QVERIFY(item);
         QTRY_COMPARE(item->y(), qreal(i*20*6));
@@ -1964,7 +1964,7 @@ void tst_QSGListView::sectionsPositioning()
     model.removeItem(5);
     QTRY_COMPARE(listview->count(), model.count());
     for (int i = 0; i < 3; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem,
+        QQuickItem *item = findItem<QQuickItem>(contentItem,
                 "sect_" + (i == 0 ? QString("aaa") : QString::number(i)));
         QVERIFY(item);
         QTRY_COMPARE(item->y(), qreal(i*20*6));
@@ -1988,24 +1988,24 @@ void tst_QSGListView::sectionsPositioning()
 
     // Turn sticky footer off
     listview->setContentY(50);
-    canvas->rootObject()->setProperty("sectionPositioning", QVariant(int(QSGViewSection::InlineLabels | QSGViewSection::CurrentLabelAtStart)));
+    canvas->rootObject()->setProperty("sectionPositioning", QVariant(int(QQuickViewSection::InlineLabels | QQuickViewSection::CurrentLabelAtStart)));
     item = findVisibleChild(contentItem, "sect_new"); // inline label restored
     QCOMPARE(item->y(), 360.);
 
     // Turn sticky header off
     listview->setContentY(50);
-    canvas->rootObject()->setProperty("sectionPositioning", QVariant(int(QSGViewSection::InlineLabels)));
+    canvas->rootObject()->setProperty("sectionPositioning", QVariant(int(QQuickViewSection::InlineLabels)));
     item = findVisibleChild(contentItem, "sect_aaa"); // inline label restored
     QCOMPARE(item->y(), 20.);
 
     delete canvas;
 }
 
-void tst_QSGListView::currentIndex_delayedItemCreation()
+void tst_QQuickListView::currentIndex_delayedItemCreation()
 {
     QFETCH(bool, setCurrentToZero);
 
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     TestModel model;
 
@@ -2016,10 +2016,10 @@ void tst_QSGListView::currentIndex_delayedItemCreation()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("fillModelOnComponentCompleted.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     QSignalSpy spy(listview, SIGNAL(currentIndexChanged()));
@@ -2029,7 +2029,7 @@ void tst_QSGListView::currentIndex_delayedItemCreation()
     delete canvas;
 }
 
-void tst_QSGListView::currentIndex_delayedItemCreation_data()
+void tst_QQuickListView::currentIndex_delayedItemCreation_data()
 {
     QTest::addColumn<bool>("setCurrentToZero");
 
@@ -2037,13 +2037,13 @@ void tst_QSGListView::currentIndex_delayedItemCreation_data()
     QTest::newRow("don't set to 0") << false;
 }
 
-void tst_QSGListView::currentIndex()
+void tst_QQuickListView::currentIndex()
 {
     TestModel model;
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), QString::number(i));
 
-    QSGView *canvas = new QSGView(0);
+    QQuickView *canvas = new QQuickView(0);
     canvas->setGeometry(0,0,240,320);
 
     QDeclarativeContext *ctxt = canvas->rootContext();
@@ -2055,17 +2055,17 @@ void tst_QSGListView::currentIndex()
 
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    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<QSGItem>(contentItem, "wrapper", 20));
+    QCOMPARE(listview->currentItem(), findItem<QQuickItem>(contentItem, "wrapper", 20));
     QCOMPARE(listview->highlightItem()->y(), listview->currentItem()->y());
 
     // no wrap
@@ -2174,13 +2174,13 @@ void tst_QSGListView::currentIndex()
     delete canvas;
 }
 
-void tst_QSGListView::noCurrentIndex()
+void tst_QQuickListView::noCurrentIndex()
 {
     TestModel model;
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), QString::number(i));
 
-    QSGView *canvas = new QSGView(0);
+    QQuickView *canvas = new QQuickView(0);
     canvas->setGeometry(0,0,240,320);
 
     QDeclarativeContext *ctxt = canvas->rootContext();
@@ -2191,10 +2191,10 @@ void tst_QSGListView::noCurrentIndex()
 
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     // current index should be -1 at startup
@@ -2212,50 +2212,50 @@ void tst_QSGListView::noCurrentIndex()
     delete canvas;
 }
 
-void tst_QSGListView::itemList()
+void tst_QQuickListView::itemList()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("itemlist.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "view");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "view");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
-    QSGVisualItemModel *model = canvas->rootObject()->findChild<QSGVisualItemModel*>("itemModel");
+    QQuickVisualItemModel *model = canvas->rootObject()->findChild<QQuickVisualItemModel*>("itemModel");
     QTRY_VERIFY(model != 0);
 
     QTRY_VERIFY(model->count() == 3);
     QTRY_COMPARE(listview->currentIndex(), 0);
 
-    QSGItem *item = findItem<QSGItem>(contentItem, "item1");
+    QQuickItem *item = findItem<QQuickItem>(contentItem, "item1");
     QTRY_VERIFY(item);
     QTRY_COMPARE(item->x(), 0.0);
     QCOMPARE(item->height(), listview->height());
 
-    QSGText *text = findItem<QSGText>(contentItem, "text1");
+    QQuickText *text = findItem<QQuickText>(contentItem, "text1");
     QTRY_VERIFY(text);
     QTRY_COMPARE(text->text(), QLatin1String("index: 0"));
 
     listview->setCurrentIndex(2);
 
-    item = findItem<QSGItem>(contentItem, "item3");
+    item = findItem<QQuickItem>(contentItem, "item3");
     QTRY_VERIFY(item);
     QTRY_COMPARE(item->x(), 480.0);
 
-    text = findItem<QSGText>(contentItem, "text3");
+    text = findItem<QQuickText>(contentItem, "text3");
     QTRY_VERIFY(text);
     QTRY_COMPARE(text->text(), QLatin1String("index: 2"));
 
     delete canvas;
 }
 
-void tst_QSGListView::cacheBuffer()
+void tst_QQuickListView::cacheBuffer()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -2270,19 +2270,19 @@ void tst_QSGListView::cacheBuffer()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    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<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
         QTRY_VERIFY(item->y() == i*20);
@@ -2291,12 +2291,12 @@ void tst_QSGListView::cacheBuffer()
     testObject->setCacheBuffer(400);
     QTRY_VERIFY(listview->cacheBuffer() == 400);
 
-    int newItemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int newItemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     QTRY_VERIFY(newItemCount > itemCount);
 
     // Confirm items positioned correctly
     for (int i = 0; i < model.count() && i < newItemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
         QTRY_VERIFY(item->y() == i*20);
@@ -2306,9 +2306,9 @@ void tst_QSGListView::cacheBuffer()
     delete testObject;
 }
 
-void tst_QSGListView::positionViewAtIndex()
+void tst_QQuickListView::positionViewAtIndex()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 40; i++)
@@ -2323,125 +2323,125 @@ void tst_QSGListView::positionViewAtIndex()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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, QSGListView::Beginning);
+    listview->positionViewAtIndex(3, QQuickListView::Beginning);
     QTRY_COMPARE(listview->contentY(), 60.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 3; i < model.count() && i < itemCount-3-1; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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, QSGListView::Beginning);
+    listview->positionViewAtIndex(22, QQuickListView::Beginning);
     QTRY_COMPARE(listview->contentY(), 440.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 22; i < model.count() && i < itemCount-22-1; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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, QSGListView::Beginning);
+    listview->positionViewAtIndex(28, QQuickListView::Beginning);
     QTRY_COMPARE(listview->contentY(), 480.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 24; i < model.count() && i < itemCount-24-1; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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, QSGListView::Beginning);
+    listview->positionViewAtIndex(0, QQuickListView::Beginning);
     QTRY_COMPARE(listview->contentY(), 0.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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, QSGListView::End);
+    listview->positionViewAtIndex(model.count()-1, QQuickListView::End);
     QTRY_COMPARE(listview->contentY(), 480.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 24; i < model.count(); ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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, QSGListView::End);
+    listview->positionViewAtIndex(20, QQuickListView::End);
     QTRY_COMPARE(listview->contentY(), 100.);
 
     // Position in Center
-    listview->positionViewAtIndex(15, QSGListView::Center);
+    listview->positionViewAtIndex(15, QQuickListView::Center);
     QTRY_COMPARE(listview->contentY(), 150.);
 
     // Ensure at least partially visible
-    listview->positionViewAtIndex(15, QSGListView::Visible);
+    listview->positionViewAtIndex(15, QQuickListView::Visible);
     QTRY_COMPARE(listview->contentY(), 150.);
 
     listview->setContentY(302);
-    listview->positionViewAtIndex(15, QSGListView::Visible);
+    listview->positionViewAtIndex(15, QQuickListView::Visible);
     QTRY_COMPARE(listview->contentY(), 302.);
 
     listview->setContentY(320);
-    listview->positionViewAtIndex(15, QSGListView::Visible);
+    listview->positionViewAtIndex(15, QQuickListView::Visible);
     QTRY_COMPARE(listview->contentY(), 300.);
 
     listview->setContentY(85);
-    listview->positionViewAtIndex(20, QSGListView::Visible);
+    listview->positionViewAtIndex(20, QQuickListView::Visible);
     QTRY_COMPARE(listview->contentY(), 85.);
 
     listview->setContentY(75);
-    listview->positionViewAtIndex(20, QSGListView::Visible);
+    listview->positionViewAtIndex(20, QQuickListView::Visible);
     QTRY_COMPARE(listview->contentY(), 100.);
 
     // Ensure completely visible
     listview->setContentY(120);
-    listview->positionViewAtIndex(20, QSGListView::Contain);
+    listview->positionViewAtIndex(20, QQuickListView::Contain);
     QTRY_COMPARE(listview->contentY(), 120.);
 
     listview->setContentY(302);
-    listview->positionViewAtIndex(15, QSGListView::Contain);
+    listview->positionViewAtIndex(15, QQuickListView::Contain);
     QTRY_COMPARE(listview->contentY(), 300.);
 
     listview->setContentY(85);
-    listview->positionViewAtIndex(20, QSGListView::Contain);
+    listview->positionViewAtIndex(20, QQuickListView::Contain);
     QTRY_COMPARE(listview->contentY(), 100.);
 
     // positionAtBeginnging
@@ -2474,9 +2474,9 @@ void tst_QSGListView::positionViewAtIndex()
     delete testObject;
 }
 
-void tst_QSGListView::resetModel()
+void tst_QQuickListView::resetModel()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     QStringList strings;
     strings << "one" << "two" << "three";
@@ -2488,16 +2488,16 @@ void tst_QSGListView::resetModel()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("displaylist.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     QTRY_COMPARE(listview->count(), model.rowCount());
 
     for (int i = 0; i < model.rowCount(); ++i) {
-        QSGText *display = findItem<QSGText>(contentItem, "displayText", i);
+        QQuickText *display = findItem<QQuickText>(contentItem, "displayText", i);
         QTRY_VERIFY(display != 0);
         QTRY_COMPARE(display->text(), strings.at(i));
     }
@@ -2509,7 +2509,7 @@ void tst_QSGListView::resetModel()
     QTRY_COMPARE(listview->count(), model.rowCount());
 
     for (int i = 0; i < model.rowCount(); ++i) {
-        QSGText *display = findItem<QSGText>(contentItem, "displayText", i);
+        QQuickText *display = findItem<QQuickText>(contentItem, "displayText", i);
         QTRY_VERIFY(display != 0);
         QTRY_COMPARE(display->text(), strings.at(i));
     }
@@ -2517,13 +2517,13 @@ void tst_QSGListView::resetModel()
     delete canvas;
 }
 
-void tst_QSGListView::propertyChanges()
+void tst_QQuickListView::propertyChanges()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     QTRY_VERIFY(canvas);
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml")));
 
-    QSGListView *listView = canvas->rootObject()->findChild<QSGListView*>("listView");
+    QQuickListView *listView = canvas->rootObject()->findChild<QQuickListView*>("listView");
     QTRY_VERIFY(listView);
 
     QSignalSpy highlightFollowsCurrentItemSpy(listView, SIGNAL(highlightFollowsCurrentItemChanged()));
@@ -2537,26 +2537,26 @@ void tst_QSGListView::propertyChanges()
     QTRY_COMPARE(listView->highlightFollowsCurrentItem(), true);
     QTRY_COMPARE(listView->preferredHighlightBegin(), 0.0);
     QTRY_COMPARE(listView->preferredHighlightEnd(), 0.0);
-    QTRY_COMPARE(listView->highlightRangeMode(), QSGListView::ApplyRange);
+    QTRY_COMPARE(listView->highlightRangeMode(), QQuickListView::ApplyRange);
     QTRY_COMPARE(listView->isWrapEnabled(), true);
     QTRY_COMPARE(listView->cacheBuffer(), 10);
-    QTRY_COMPARE(listView->snapMode(), QSGListView::SnapToItem);
+    QTRY_COMPARE(listView->snapMode(), QQuickListView::SnapToItem);
 
     listView->setHighlightFollowsCurrentItem(false);
     listView->setPreferredHighlightBegin(1.0);
     listView->setPreferredHighlightEnd(1.0);
-    listView->setHighlightRangeMode(QSGListView::StrictlyEnforceRange);
+    listView->setHighlightRangeMode(QQuickListView::StrictlyEnforceRange);
     listView->setWrapEnabled(false);
     listView->setCacheBuffer(3);
-    listView->setSnapMode(QSGListView::SnapOneItem);
+    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(), QSGListView::StrictlyEnforceRange);
+    QTRY_COMPARE(listView->highlightRangeMode(), QQuickListView::StrictlyEnforceRange);
     QTRY_COMPARE(listView->isWrapEnabled(), false);
     QTRY_COMPARE(listView->cacheBuffer(), 3);
-    QTRY_COMPARE(listView->snapMode(), QSGListView::SnapOneItem);
+    QTRY_COMPARE(listView->snapMode(), QQuickListView::SnapOneItem);
 
     QTRY_COMPARE(highlightFollowsCurrentItemSpy.count(),1);
     QTRY_COMPARE(preferredHighlightBeginSpy.count(),1);
@@ -2569,10 +2569,10 @@ void tst_QSGListView::propertyChanges()
     listView->setHighlightFollowsCurrentItem(false);
     listView->setPreferredHighlightBegin(1.0);
     listView->setPreferredHighlightEnd(1.0);
-    listView->setHighlightRangeMode(QSGListView::StrictlyEnforceRange);
+    listView->setHighlightRangeMode(QQuickListView::StrictlyEnforceRange);
     listView->setWrapEnabled(false);
     listView->setCacheBuffer(3);
-    listView->setSnapMode(QSGListView::SnapOneItem);
+    listView->setSnapMode(QQuickListView::SnapOneItem);
 
     QTRY_COMPARE(highlightFollowsCurrentItemSpy.count(),1);
     QTRY_COMPARE(preferredHighlightBeginSpy.count(),1);
@@ -2585,13 +2585,13 @@ void tst_QSGListView::propertyChanges()
     delete canvas;
 }
 
-void tst_QSGListView::componentChanges()
+void tst_QQuickListView::componentChanges()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     QTRY_VERIFY(canvas);
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml")));
 
-    QSGListView *listView = canvas->rootObject()->findChild<QSGListView*>("listView");
+    QQuickListView *listView = canvas->rootObject()->findChild<QQuickListView*>("listView");
     QTRY_VERIFY(listView);
 
     QDeclarativeComponent component(canvas->engine());
@@ -2633,13 +2633,13 @@ void tst_QSGListView::componentChanges()
     delete canvas;
 }
 
-void tst_QSGListView::modelChanges()
+void tst_QQuickListView::modelChanges()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     QTRY_VERIFY(canvas);
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("propertychangestest.qml")));
 
-    QSGListView *listView = canvas->rootObject()->findChild<QSGListView*>("listView");
+    QQuickListView *listView = canvas->rootObject()->findChild<QQuickListView*>("listView");
     QTRY_VERIFY(listView);
 
     QDeclarativeListModel *alternateModel = canvas->rootObject()->findChild<QDeclarativeListModel*>("alternateModel");
@@ -2660,17 +2660,17 @@ void tst_QSGListView::modelChanges()
     delete canvas;
 }
 
-void tst_QSGListView::QTBUG_9791()
+void tst_QQuickListView::QTBUG_9791()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("strictlyenforcerange.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = qobject_cast<QSGListView*>(canvas->rootObject());
+    QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject());
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
     QTRY_VERIFY(listview->delegate() != 0);
     QTRY_VERIFY(listview->model() != 0);
@@ -2679,11 +2679,11 @@ void tst_QSGListView::QTBUG_9791()
     qApp->processEvents();
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     QCOMPARE(itemCount, 3);
 
     for (int i = 0; i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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);
@@ -2695,9 +2695,9 @@ void tst_QSGListView::QTBUG_9791()
     delete canvas;
 }
 
-void tst_QSGListView::manualHighlight()
+void tst_QQuickListView::manualHighlight()
 {
-    QSGView *canvas = new QSGView(0);
+    QQuickView *canvas = new QQuickView(0);
     canvas->setGeometry(0,0,240,320);
 
     QString filename(TESTDATA("manual-highlight.qml"));
@@ -2705,35 +2705,35 @@ void tst_QSGListView::manualHighlight()
 
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     QTRY_COMPARE(listview->currentIndex(), 0);
-    QTRY_COMPARE(listview->currentItem(), findItem<QSGItem>(contentItem, "wrapper", 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<QSGItem>(contentItem, "wrapper", 2));
+    QTRY_COMPARE(listview->currentItem(), findItem<QQuickItem>(contentItem, "wrapper", 2));
     QTRY_COMPARE(listview->highlightItem()->y() - 5, listview->currentItem()->y());
 
     // QTBUG-15972
-    listview->positionViewAtIndex(3, QSGListView::Contain);
+    listview->positionViewAtIndex(3, QQuickListView::Contain);
 
     QTRY_COMPARE(listview->currentIndex(), 2);
-    QTRY_COMPARE(listview->currentItem(), findItem<QSGItem>(contentItem, "wrapper", 2));
+    QTRY_COMPARE(listview->currentItem(), findItem<QQuickItem>(contentItem, "wrapper", 2));
     QTRY_COMPARE(listview->highlightItem()->y() - 5, listview->currentItem()->y());
 
     delete canvas;
 }
 
-void tst_QSGListView::QTBUG_11105()
+void tst_QQuickListView::QTBUG_11105()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -2748,22 +2748,22 @@ void tst_QSGListView::QTBUG_11105()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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, QSGListView::Beginning);
+    listview->positionViewAtIndex(20, QQuickListView::Beginning);
     QCOMPARE(listview->contentY(), 280.);
 
     TestModel model2;
@@ -2772,16 +2772,16 @@ void tst_QSGListView::QTBUG_11105()
 
     ctxt->setContextProperty("testModel", &model2);
 
-    itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     QCOMPARE(itemCount, 5);
 
     delete canvas;
     delete testObject;
 }
 
-void tst_QSGListView::header()
+void tst_QQuickListView::header()
 {
-    QFETCH(QSGListView::Orientation, orientation);
+    QFETCH(QQuickListView::Orientation, orientation);
     QFETCH(Qt::LayoutDirection, layoutDirection);
     QFETCH(QPointF, initialHeaderPos);
     QFETCH(QPointF, firstDelegatePos);
@@ -2794,21 +2794,21 @@ void tst_QSGListView::header()
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), "");
 
-    QSGView *canvas = createView();
+    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")));
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
     listview->setOrientation(orientation);
     listview->setLayoutDirection(layoutDirection);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
-    QSGText *header = findItem<QSGText>(contentItem, "header");
+    QQuickText *header = findItem<QQuickText>(contentItem, "header");
     QVERIFY(header);
 
     QVERIFY(header == listview->headerItem());
@@ -2818,7 +2818,7 @@ void tst_QSGListView::header()
     QCOMPARE(header->pos(), initialHeaderPos);
     QCOMPARE(QPointF(listview->contentX(), listview->contentY()), initialContentPos);
 
-    QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 0);
+    QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 0);
     QVERIFY(item);
     QCOMPARE(item->pos(), firstDelegatePos);
 
@@ -2833,9 +2833,9 @@ void tst_QSGListView::header()
 
     QCOMPARE(headerItemSpy.count(), 1);
 
-    header = findItem<QSGText>(contentItem, "header");
+    header = findItem<QQuickText>(contentItem, "header");
     QVERIFY(!header);
-    header = findItem<QSGText>(contentItem, "header2");
+    header = findItem<QQuickText>(contentItem, "header2");
     QVERIFY(header);
 
     QVERIFY(header == listview->headerItem());
@@ -2857,7 +2857,7 @@ void tst_QSGListView::header()
     canvas->rootContext()->setContextProperty("initialViewHeight", 0.0);
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("header.qml")));
 
-    listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
     listview->setOrientation(orientation);
     listview->setLayoutDirection(layoutDirection);
@@ -2871,9 +2871,9 @@ void tst_QSGListView::header()
     delete canvas;
 }
 
-void tst_QSGListView::header_data()
+void tst_QQuickListView::header_data()
 {
-    QTest::addColumn<QSGListView::Orientation>("orientation");
+    QTest::addColumn<QQuickListView::Orientation>("orientation");
     QTest::addColumn<Qt::LayoutDirection>("layoutDirection");
     QTest::addColumn<QPointF>("initialHeaderPos");
     QTest::addColumn<QPointF>("changedHeaderPos");
@@ -2888,7 +2888,7 @@ void tst_QSGListView::header_data()
     // view width = 240
 
     // header above items, top left
-    QTest::newRow("vertical, left to right") << QSGListView::Vertical << Qt::LeftToRight
+    QTest::newRow("vertical, left to right") << QQuickListView::Vertical << Qt::LeftToRight
         << QPointF(0, -30)
         << QPointF(0, -20)
         << QPointF(0, -30)
@@ -2897,7 +2897,7 @@ void tst_QSGListView::header_data()
         << QPointF(0, -10);
 
     // header above items, top right
-    QTest::newRow("vertical, layout right to left") << QSGListView::Vertical << Qt::RightToLeft
+    QTest::newRow("vertical, layout right to left") << QQuickListView::Vertical << Qt::RightToLeft
         << QPointF(0, -30)
         << QPointF(0, -20)
         << QPointF(0, -30)
@@ -2906,7 +2906,7 @@ void tst_QSGListView::header_data()
         << QPointF(0, -10);
 
     // header to left of items
-    QTest::newRow("horizontal, layout left to right") << QSGListView::Horizontal << Qt::LeftToRight
+    QTest::newRow("horizontal, layout left to right") << QQuickListView::Horizontal << Qt::LeftToRight
         << QPointF(-100, 0)
         << QPointF(-50, 0)
         << QPointF(-100, 0)
@@ -2915,7 +2915,7 @@ void tst_QSGListView::header_data()
         << QPointF(-40, 0);
 
     // header to right of items
-    QTest::newRow("horizontal, layout right to left") << QSGListView::Horizontal << Qt::RightToLeft
+    QTest::newRow("horizontal, layout right to left") << QQuickListView::Horizontal << Qt::RightToLeft
         << QPointF(0, 0)
         << QPointF(0, 0)
         << QPointF(-240 + 100, 0)
@@ -2924,9 +2924,9 @@ void tst_QSGListView::header_data()
         << QPointF(-240 + 40, 0);
 }
 
-void tst_QSGListView::header_delayItemCreation()
+void tst_QQuickListView::header_delayItemCreation()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     TestModel model;
 
@@ -2934,13 +2934,13 @@ void tst_QSGListView::header_delayItemCreation()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("fillModelOnComponentCompleted.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
-    QSGText *header = findItem<QSGText>(contentItem, "header");
+    QQuickText *header = findItem<QQuickText>(contentItem, "header");
     QVERIFY(header);
     QCOMPARE(header->y(), -header->height());
 
@@ -2952,9 +2952,9 @@ void tst_QSGListView::header_delayItemCreation()
     delete canvas;
 }
 
-void tst_QSGListView::footer()
+void tst_QQuickListView::footer()
 {
-    QFETCH(QSGListView::Orientation, orientation);
+    QFETCH(QQuickListView::Orientation, orientation);
     QFETCH(Qt::LayoutDirection, layoutDirection);
     QFETCH(QPointF, initialFooterPos);
     QFETCH(QPointF, firstDelegatePos);
@@ -2963,7 +2963,7 @@ void tst_QSGListView::footer()
     QFETCH(QPointF, changedContentPos);
     QFETCH(QPointF, resizeContentPos);
 
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 3; i++)
@@ -2976,15 +2976,15 @@ void tst_QSGListView::footer()
     canvas->show();
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
     listview->setOrientation(orientation);
     listview->setLayoutDirection(layoutDirection);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
-    QSGText *footer = findItem<QSGText>(contentItem, "footer");
+    QQuickText *footer = findItem<QQuickText>(contentItem, "footer");
     QVERIFY(footer);
 
     QVERIFY(footer == listview->footerItem());
@@ -2994,14 +2994,14 @@ void tst_QSGListView::footer()
     QCOMPARE(footer->height(), 30.);
     QCOMPARE(QPointF(listview->contentX(), listview->contentY()), initialContentPos);
 
-    QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 0);
+    QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 0);
     QVERIFY(item);
     QCOMPARE(item->pos(), firstDelegatePos);
 
     // remove one item
     model.removeItem(1);
 
-    if (orientation == QSGListView::Vertical) {
+    if (orientation == QQuickListView::Vertical) {
         QTRY_COMPARE(footer->y(), initialFooterPos.y() - 20);   // delegate height = 20
     } else {
         QTRY_COMPARE(footer->x(), layoutDirection == Qt::LeftToRight ?
@@ -3012,7 +3012,7 @@ void tst_QSGListView::footer()
     model.clear();
 
     QPointF posWhenNoItems(0, 0);
-    if (orientation == QSGListView::Horizontal && layoutDirection == Qt::RightToLeft)
+    if (orientation == QQuickListView::Horizontal && layoutDirection == Qt::RightToLeft)
         posWhenNoItems.setX(-100);
     QTRY_COMPARE(footer->pos(), posWhenNoItems);
 
@@ -3030,9 +3030,9 @@ void tst_QSGListView::footer()
 
     QCOMPARE(footerItemSpy.count(), 1);
 
-    footer = findItem<QSGText>(contentItem, "footer");
+    footer = findItem<QQuickText>(contentItem, "footer");
     QVERIFY(!footer);
-    footer = findItem<QSGText>(contentItem, "footer2");
+    footer = findItem<QQuickText>(contentItem, "footer2");
     QVERIFY(footer);
 
     QVERIFY(footer == listview->footerItem());
@@ -3042,7 +3042,7 @@ void tst_QSGListView::footer()
     QCOMPARE(footer->height(), 20.);
     QTRY_COMPARE(QPointF(listview->contentX(), listview->contentY()), changedContentPos);
 
-    item = findItem<QSGItem>(contentItem, "wrapper", 0);
+    item = findItem<QQuickItem>(contentItem, "wrapper", 0);
     QVERIFY(item);
     QCOMPARE(item->pos(), firstDelegatePos);
 
@@ -3054,9 +3054,9 @@ void tst_QSGListView::footer()
     delete canvas;
 }
 
-void tst_QSGListView::footer_data()
+void tst_QQuickListView::footer_data()
 {
-    QTest::addColumn<QSGListView::Orientation>("orientation");
+    QTest::addColumn<QQuickListView::Orientation>("orientation");
     QTest::addColumn<Qt::LayoutDirection>("layoutDirection");
     QTest::addColumn<QPointF>("initialFooterPos");
     QTest::addColumn<QPointF>("changedFooterPos");
@@ -3072,7 +3072,7 @@ void tst_QSGListView::footer_data()
     // view height = 320
 
     // footer below items, bottom left
-    QTest::newRow("vertical, layout left to right") << QSGListView::Vertical << Qt::LeftToRight
+    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)
@@ -3081,7 +3081,7 @@ void tst_QSGListView::footer_data()
         << QPointF(0, 30 * 20 - 320 + 10);
 
     // footer below items, bottom right
-    QTest::newRow("vertical, layout right to left") << QSGListView::Vertical << Qt::RightToLeft
+    QTest::newRow("vertical, layout right to left") << QQuickListView::Vertical << Qt::RightToLeft
         << QPointF(0, 3 * 20)
         << QPointF(0, 30 * 20)
         << QPointF(0, 0)
@@ -3090,7 +3090,7 @@ void tst_QSGListView::footer_data()
         << QPointF(0, 30 * 20 - 320 + 10);
 
     // footer to right of items
-    QTest::newRow("horizontal, layout left to right") << QSGListView::Horizontal << Qt::LeftToRight
+    QTest::newRow("horizontal, layout left to right") << QQuickListView::Horizontal << Qt::LeftToRight
         << QPointF(40 * 3, 0)
         << QPointF(40 * 30, 0)
         << QPointF(0, 0)
@@ -3099,7 +3099,7 @@ void tst_QSGListView::footer_data()
         << QPointF(40 * 30 - 240 + 40, 0);
 
     // footer to left of items
-    QTest::newRow("horizontal, layout right to left") << QSGListView::Horizontal << Qt::RightToLeft
+    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)
@@ -3108,7 +3108,7 @@ void tst_QSGListView::footer_data()
         << QPointF(-(40 * 30) - 40, 0);
 }
 
-class LVAccessor : public QSGListView
+class LVAccessor : public QQuickListView
 {
 public:
     qreal minY() const { return minYExtent(); }
@@ -3117,11 +3117,11 @@ public:
     qreal maxX() const { return maxXExtent(); }
 };
 
-void tst_QSGListView::headerFooter()
+void tst_QQuickListView::headerFooter()
 {
     {
         // Vertical
-        QSGView *canvas = createView();
+        QQuickView *canvas = createView();
 
         TestModel model;
         QDeclarativeContext *ctxt = canvas->rootContext();
@@ -3130,17 +3130,17 @@ void tst_QSGListView::headerFooter()
         canvas->setSource(QUrl::fromLocalFile(TESTDATA("headerfooter.qml")));
         qApp->processEvents();
 
-        QSGListView *listview = qobject_cast<QSGListView*>(canvas->rootObject());
+        QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject());
         QTRY_VERIFY(listview != 0);
 
-        QSGItem *contentItem = listview->contentItem();
+        QQuickItem *contentItem = listview->contentItem();
         QTRY_VERIFY(contentItem != 0);
 
-        QSGItem *header = findItem<QSGItem>(contentItem, "header");
+        QQuickItem *header = findItem<QQuickItem>(contentItem, "header");
         QVERIFY(header);
         QCOMPARE(header->y(), -header->height());
 
-        QSGItem *footer = findItem<QSGItem>(contentItem, "footer");
+        QQuickItem *footer = findItem<QQuickItem>(contentItem, "footer");
         QVERIFY(footer);
         QCOMPARE(footer->y(), 0.);
 
@@ -3151,7 +3151,7 @@ void tst_QSGListView::headerFooter()
     }
     {
         // Horizontal
-        QSGView *canvas = createView();
+        QQuickView *canvas = createView();
 
         TestModel model;
         QDeclarativeContext *ctxt = canvas->rootContext();
@@ -3161,17 +3161,17 @@ void tst_QSGListView::headerFooter()
         canvas->rootObject()->setProperty("horizontal", true);
         qApp->processEvents();
 
-        QSGListView *listview = qobject_cast<QSGListView*>(canvas->rootObject());
+        QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject());
         QTRY_VERIFY(listview != 0);
 
-        QSGItem *contentItem = listview->contentItem();
+        QQuickItem *contentItem = listview->contentItem();
         QTRY_VERIFY(contentItem != 0);
 
-        QSGItem *header = findItem<QSGItem>(contentItem, "header");
+        QQuickItem *header = findItem<QQuickItem>(contentItem, "header");
         QVERIFY(header);
         QCOMPARE(header->x(), -header->width());
 
-        QSGItem *footer = findItem<QSGItem>(contentItem, "footer");
+        QQuickItem *footer = findItem<QQuickItem>(contentItem, "footer");
         QVERIFY(footer);
         QCOMPARE(footer->x(), 0.);
 
@@ -3182,7 +3182,7 @@ void tst_QSGListView::headerFooter()
     }
     {
         // Horizontal RTL
-        QSGView *canvas = createView();
+        QQuickView *canvas = createView();
 
         TestModel model;
         QDeclarativeContext *ctxt = canvas->rootContext();
@@ -3193,17 +3193,17 @@ void tst_QSGListView::headerFooter()
         canvas->rootObject()->setProperty("rtl", true);
         qApp->processEvents();
 
-        QSGListView *listview = qobject_cast<QSGListView*>(canvas->rootObject());
+        QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject());
         QTRY_VERIFY(listview != 0);
 
-        QSGItem *contentItem = listview->contentItem();
+        QQuickItem *contentItem = listview->contentItem();
         QTRY_VERIFY(contentItem != 0);
 
-        QSGItem *header = findItem<QSGItem>(contentItem, "header");
+        QQuickItem *header = findItem<QQuickItem>(contentItem, "header");
         QVERIFY(header);
         QCOMPARE(header->x(), 0.);
 
-        QSGItem *footer = findItem<QSGItem>(contentItem, "footer");
+        QQuickItem *footer = findItem<QQuickItem>(contentItem, "footer");
         QVERIFY(footer);
         QCOMPARE(footer->x(), -footer->width());
 
@@ -3214,9 +3214,9 @@ void tst_QSGListView::headerFooter()
     }
 }
 
-void tst_QSGListView::resizeView()
+void tst_QQuickListView::resizeView()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 40; i++)
@@ -3231,16 +3231,16 @@ void tst_QSGListView::resizeView()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
         QTRY_COMPARE(item->y(), i*20.);
@@ -3259,9 +3259,9 @@ void tst_QSGListView::resizeView()
     delete testObject;
 }
 
-void tst_QSGListView::resizeViewAndRepaint()
+void tst_QQuickListView::resizeViewAndRepaint()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
 
     TestModel model;
@@ -3275,26 +3275,26 @@ void tst_QSGListView::resizeViewAndRepaint()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("resizeview.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     // item at index 10 should not be currently visible
-    QVERIFY(!findItem<QSGItem>(contentItem, "wrapper", 10));
+    QVERIFY(!findItem<QQuickItem>(contentItem, "wrapper", 10));
 
     listview->setHeight(320);
-    QTRY_VERIFY(findItem<QSGItem>(contentItem, "wrapper", 10));
+    QTRY_VERIFY(findItem<QQuickItem>(contentItem, "wrapper", 10));
 
     listview->setHeight(100);
-    QTRY_VERIFY(!findItem<QSGItem>(contentItem, "wrapper", 10));
+    QTRY_VERIFY(!findItem<QQuickItem>(contentItem, "wrapper", 10));
 
     delete canvas;
 }
 
-void tst_QSGListView::sizeLessThan1()
+void tst_QQuickListView::sizeLessThan1()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -3309,16 +3309,16 @@ void tst_QSGListView::sizeLessThan1()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("sizelessthan1.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QSGItem>(contentItem, "wrapper").count();
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", 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);
@@ -3328,17 +3328,17 @@ void tst_QSGListView::sizeLessThan1()
     delete testObject;
 }
 
-void tst_QSGListView::QTBUG_14821()
+void tst_QQuickListView::QTBUG_14821()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("qtbug14821.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = qobject_cast<QSGListView*>(canvas->rootObject());
+    QQuickListView *listview = qobject_cast<QQuickListView*>(canvas->rootObject());
     QVERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
     listview->decrementCurrentIndex();
@@ -3350,9 +3350,9 @@ void tst_QSGListView::QTBUG_14821()
     delete canvas;
 }
 
-void tst_QSGListView::resizeDelegate()
+void tst_QQuickListView::resizeDelegate()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
 
     QStringList strings;
@@ -3366,10 +3366,10 @@ void tst_QSGListView::resizeDelegate()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("displaylist.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
     QCOMPARE(listview->count(), model.rowCount());
@@ -3379,7 +3379,7 @@ void tst_QSGListView::resizeDelegate()
     QTest::qWait(300);
 
     for (int i = 0; i < 16; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         QVERIFY(item != 0);
         QCOMPARE(item->y(), i*20.0);
     }
@@ -3391,7 +3391,7 @@ void tst_QSGListView::resizeDelegate()
     QTest::qWait(300);
 
     for (int i = 0; i < 11; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         QVERIFY(item != 0);
         QTRY_COMPARE(item->y(), i*30.0);
     }
@@ -3400,11 +3400,11 @@ void tst_QSGListView::resizeDelegate()
     QTRY_COMPARE(listview->highlightItem()->y(), 750.0);
 
     listview->setCurrentIndex(1);
-    listview->positionViewAtIndex(25, QSGListView::Beginning);
-    listview->positionViewAtIndex(5, QSGListView::Beginning);
+    listview->positionViewAtIndex(25, QQuickListView::Beginning);
+    listview->positionViewAtIndex(5, QQuickListView::Beginning);
 
     for (int i = 5; i < 16; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         QVERIFY(item != 0);
         QCOMPARE(item->y(), i*30.0);
     }
@@ -3416,7 +3416,7 @@ void tst_QSGListView::resizeDelegate()
     QTest::qWait(300);
 
     for (int i = 5; i < 11; ++i) {
-        QSGItem *item = findItem<QSGItem>(contentItem, "wrapper", i);
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         QVERIFY(item != 0);
         QTRY_COMPARE(item->y(), 150 + (i-5)*20.0);
     }
@@ -3427,12 +3427,12 @@ void tst_QSGListView::resizeDelegate()
     delete canvas;
 }
 
-void tst_QSGListView::resizeFirstDelegate()
+void tst_QQuickListView::resizeFirstDelegate()
 {
     // QTBUG-20712: Content Y jumps constantly if first delegate height == 0
     // and other delegates have height > 0
 
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
 
     // bug only occurs when all items in the model are visible
@@ -3449,20 +3449,20 @@ void tst_QSGListView::resizeFirstDelegate()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QSGItem *item = 0;
+    QQuickItem *item = 0;
     for (int i = 0; i < model.count(); ++i) {
-        item = findItem<QSGItem>(contentItem, "wrapper", i);
+        item = findItem<QQuickItem>(contentItem, "wrapper", i);
         QVERIFY(item != 0);
         QCOMPARE(item->y(), i*20.0);
     }
 
-    item = findItem<QSGItem>(contentItem, "wrapper", 0);
+    item = findItem<QQuickItem>(contentItem, "wrapper", 0);
     item->setHeight(0);
 
     // check the content y has not jumped up and down
@@ -3472,7 +3472,7 @@ void tst_QSGListView::resizeFirstDelegate()
     QCOMPARE(spy.count(), 0);
 
     for (int i = 1; i < model.count(); ++i) {
-        item = findItem<QSGItem>(contentItem, "wrapper", i);
+        item = findItem<QQuickItem>(contentItem, "wrapper", i);
         QVERIFY(item != 0);
         QTRY_COMPARE(item->y(), (i-1)*20.0);
     }
@@ -3481,15 +3481,15 @@ void tst_QSGListView::resizeFirstDelegate()
     delete canvas;
 }
 
-void tst_QSGListView::QTBUG_16037()
+void tst_QQuickListView::QTBUG_16037()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->show();
 
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("qtbug16037.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "listview");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "listview");
     QTRY_VERIFY(listview != 0);
 
     QVERIFY(listview->contentHeight() <= 0.0);
@@ -3501,9 +3501,9 @@ void tst_QSGListView::QTBUG_16037()
     delete canvas;
 }
 
-void tst_QSGListView::indexAt()
+void tst_QQuickListView::indexAt()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
@@ -3518,10 +3518,10 @@ void tst_QSGListView::indexAt()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("listviewtest.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     QCOMPARE(listview->indexAt(0,0), 0);
@@ -3534,9 +3534,9 @@ void tst_QSGListView::indexAt()
     delete testObject;
 }
 
-void tst_QSGListView::incrementalModel()
+void tst_QQuickListView::incrementalModel()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     IncrementalModel model;
     QDeclarativeContext *ctxt = canvas->rootContext();
@@ -3545,22 +3545,22 @@ void tst_QSGListView::incrementalModel()
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("displaylist.qml")));
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     QTRY_COMPARE(listview->count(), 20);
 
-    listview->positionViewAtIndex(10, QSGListView::Beginning);
+    listview->positionViewAtIndex(10, QQuickListView::Beginning);
 
     QTRY_COMPARE(listview->count(), 25);
 
     delete canvas;
 }
 
-void tst_QSGListView::onAdd()
+void tst_QQuickListView::onAdd()
 {
     QFETCH(int, initialItemCount);
     QFETCH(int, itemsToAdd);
@@ -3572,7 +3572,7 @@ void tst_QSGListView::onAdd()
     for (int i=0; i<initialItemCount; i++)
         model.addItem("dummy value", "dummy value");
 
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->setGeometry(0,0,200, delegateHeight * (initialItemCount + itemsToAdd));
     QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
@@ -3598,7 +3598,7 @@ void tst_QSGListView::onAdd()
     delete canvas;
 }
 
-void tst_QSGListView::onAdd_data()
+void tst_QQuickListView::onAdd_data()
 {
     QTest::addColumn<int>("initialItemCount");
     QTest::addColumn<int>("itemsToAdd");
@@ -3616,7 +3616,7 @@ void tst_QSGListView::onAdd_data()
     QTest::newRow("5, add 10") << 5 << 10;
 }
 
-void tst_QSGListView::onRemove()
+void tst_QQuickListView::onRemove()
 {
     QFETCH(int, initialItemCount);
     QFETCH(int, indexToRemove);
@@ -3627,7 +3627,7 @@ void tst_QSGListView::onRemove()
     for (int i=0; i<initialItemCount; i++)
         model.addItem(QString("value %1").arg(i), "dummy value");
 
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("delegateHeight", delegateHeight);
@@ -3642,7 +3642,7 @@ void tst_QSGListView::onRemove()
     delete canvas;
 }
 
-void tst_QSGListView::onRemove_data()
+void tst_QQuickListView::onRemove_data()
 {
     QTest::addColumn<int>("initialItemCount");
     QTest::addColumn<int>("indexToRemove");
@@ -3665,21 +3665,21 @@ void tst_QSGListView::onRemove_data()
     QTest::newRow("ten items, remove 4-10") << 10 << 4 << 6;
 }
 
-void tst_QSGListView::rightToLeft()
+void tst_QQuickListView::rightToLeft()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
     canvas->setGeometry(0,0,640,320);
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("rightToLeft.qml")));
     qApp->processEvents();
 
     QVERIFY(canvas->rootObject() != 0);
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "view");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "view");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
-    QSGVisualItemModel *model = canvas->rootObject()->findChild<QSGVisualItemModel*>("itemModel");
+    QQuickVisualItemModel *model = canvas->rootObject()->findChild<QQuickVisualItemModel*>("itemModel");
     QTRY_VERIFY(model != 0);
 
     QTRY_VERIFY(model->count() == 3);
@@ -3688,44 +3688,44 @@ void tst_QSGListView::rightToLeft()
     // initial position at first item, right edge aligned
     QCOMPARE(listview->contentX(), -640.);
 
-    QSGItem *item = findItem<QSGItem>(contentItem, "item1");
+    QQuickItem *item = findItem<QQuickItem>(contentItem, "item1");
     QTRY_VERIFY(item);
     QTRY_COMPARE(item->x(), -100.0);
     QCOMPARE(item->height(), listview->height());
 
-    QSGText *text = findItem<QSGText>(contentItem, "text1");
+    QQuickText *text = findItem<QQuickText>(contentItem, "text1");
     QTRY_VERIFY(text);
     QTRY_COMPARE(text->text(), QLatin1String("index: 0"));
 
     listview->setCurrentIndex(2);
 
-    item = findItem<QSGItem>(contentItem, "item3");
+    item = findItem<QQuickItem>(contentItem, "item3");
     QTRY_VERIFY(item);
     QTRY_COMPARE(item->x(), -540.0);
 
-    text = findItem<QSGText>(contentItem, "text3");
+    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<QSGItem*>(canvas->rootObject())->setWidth(600);
+    qobject_cast<QQuickItem*>(canvas->rootObject())->setWidth(600);
     QTRY_COMPARE(listview->contentX(), -600.);
 
     delete canvas;
 }
 
-void tst_QSGListView::test_mirroring()
+void tst_QQuickListView::test_mirroring()
 {
-    QSGView *canvasA = createView();
+    QQuickView *canvasA = createView();
     canvasA->setSource(QUrl::fromLocalFile(TESTDATA("rightToLeft.qml")));
-    QSGListView *listviewA = findItem<QSGListView>(canvasA->rootObject(), "view");
+    QQuickListView *listviewA = findItem<QQuickListView>(canvasA->rootObject(), "view");
     QTRY_VERIFY(listviewA != 0);
 
-    QSGView *canvasB = createView();
+    QQuickView *canvasB = createView();
     canvasB->setSource(QUrl::fromLocalFile(TESTDATA("rightToLeft.qml")));
-    QSGListView *listviewB = findItem<QSGListView>(canvasB->rootObject(), "view");
+    QQuickListView *listviewB = findItem<QQuickListView>(canvasB->rootObject(), "view");
     QTRY_VERIFY(listviewA != 0);
     qApp->processEvents();
 
@@ -3738,48 +3738,48 @@ void tst_QSGListView::test_mirroring()
 
     // LTR != RTL
     foreach (const QString objectName, objectNames)
-        QVERIFY(findItem<QSGItem>(listviewA, objectName)->x() != findItem<QSGItem>(listviewB, objectName)->x());
+        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<QSGItem>(listviewA, objectName)->x(), findItem<QSGItem>(listviewB, objectName)->x());
+        QCOMPARE(findItem<QQuickItem>(listviewA, objectName)->x(), findItem<QQuickItem>(listviewB, objectName)->x());
 
     QVERIFY(listviewB->layoutDirection() == listviewB->effectiveLayoutDirection());
-    QSGItemPrivate::get(listviewB)->setLayoutMirror(true);
+    QQuickItemPrivate::get(listviewB)->setLayoutMirror(true);
     QVERIFY(listviewB->layoutDirection() != listviewB->effectiveLayoutDirection());
 
     // LTR != LTR+mirror
     foreach (const QString objectName, objectNames)
-        QVERIFY(findItem<QSGItem>(listviewA, objectName)->x() != findItem<QSGItem>(listviewB, objectName)->x());
+        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<QSGItem>(listviewA, objectName)->x(), findItem<QSGItem>(listviewB, objectName)->x());
+        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<QSGItem>(listviewA, objectName)->x() != findItem<QSGItem>(listviewB, objectName)->x());
+        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<QSGItem>(listviewA, objectName)->x(), findItem<QSGItem>(listviewB, objectName)->x());
+        QCOMPARE(findItem<QQuickItem>(listviewA, objectName)->x(), findItem<QQuickItem>(listviewB, objectName)->x());
 
     delete canvasA;
     delete canvasB;
 }
 
-void tst_QSGListView::margins()
+void tst_QQuickListView::margins()
 {
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     TestModel2 model;
     for (int i = 0; i < 50; i++)
@@ -3792,10 +3792,10 @@ void tst_QSGListView::margins()
     canvas->show();
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
     QCOMPARE(listview->contentY(), -30.);
@@ -3839,9 +3839,9 @@ void tst_QSGListView::margins()
     delete canvas;
 }
 
-void tst_QSGListView::snapToItem_data()
+void tst_QQuickListView::snapToItem_data()
 {
-    QTest::addColumn<QSGListView::Orientation>("orientation");
+    QTest::addColumn<QQuickListView::Orientation>("orientation");
     QTest::addColumn<Qt::LayoutDirection>("layoutDirection");
     QTest::addColumn<int>("highlightRangeMode");
     QTest::addColumn<QPoint>("flickStart");
@@ -3850,28 +3850,28 @@ void tst_QSGListView::snapToItem_data()
     QTest::addColumn<qreal>("endExtent");
     QTest::addColumn<qreal>("startExtent");
 
-    QTest::newRow("vertical, left to right") << QSGListView::Vertical << Qt::LeftToRight << int(QSGItemView::NoHighlightRange)
+    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") << QSGListView::Horizontal << Qt::LeftToRight << int(QSGItemView::NoHighlightRange)
+    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") << QSGListView::Horizontal << Qt::RightToLeft << int(QSGItemView::NoHighlightRange)
+    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") << QSGListView::Vertical << Qt::LeftToRight << int(QSGItemView::StrictlyEnforceRange)
+    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") << QSGListView::Horizontal << Qt::LeftToRight << int(QSGItemView::StrictlyEnforceRange)
+    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") << QSGListView::Horizontal << Qt::RightToLeft << int(QSGItemView::StrictlyEnforceRange)
+    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_QSGListView::snapToItem()
+void tst_QQuickListView::snapToItem()
 {
-    QFETCH(QSGListView::Orientation, orientation);
+    QFETCH(QQuickListView::Orientation, orientation);
     QFETCH(Qt::LayoutDirection, layoutDirection);
     QFETCH(int, highlightRangeMode);
     QFETCH(QPoint, flickStart);
@@ -3880,26 +3880,26 @@ void tst_QSGListView::snapToItem()
     QFETCH(qreal, endExtent);
     QFETCH(qreal, startExtent);
 
-    QSGView *canvas = createView();
+    QQuickView *canvas = createView();
 
     canvas->setSource(QUrl::fromLocalFile(TESTDATA("snapToItem.qml")));
     canvas->show();
     qApp->processEvents();
 
-    QSGListView *listview = findItem<QSGListView>(canvas->rootObject(), "list");
+    QQuickListView *listview = findItem<QQuickListView>(canvas->rootObject(), "list");
     QTRY_VERIFY(listview != 0);
 
     listview->setOrientation(orientation);
     listview->setLayoutDirection(layoutDirection);
-    listview->setHighlightRangeMode(QSGItemView::HighlightRangeMode(highlightRangeMode));
+    listview->setHighlightRangeMode(QQuickItemView::HighlightRangeMode(highlightRangeMode));
 
-    QSGItem *contentItem = listview->contentItem();
+    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 == QSGListView::Vertical)
+    if (orientation == QQuickListView::Vertical)
         QCOMPARE(qreal(fmod(listview->contentY(),80.0)), snapAlignment);
     else
         QCOMPARE(qreal(fmod(listview->contentX(),80.0)), snapAlignment);
@@ -3908,11 +3908,11 @@ void tst_QSGListView::snapToItem()
     do {
         flick(canvas, flickStart, flickEnd, 180);
         QTRY_VERIFY(listview->isMoving() == false); // wait until it stops
-    } while (orientation == QSGListView::Vertical
+    } while (orientation == QQuickListView::Vertical
            ? !listview->isAtYEnd()
            : layoutDirection == Qt::LeftToRight ? !listview->isAtXEnd() : !listview->isAtXBeginning());
 
-    if (orientation == QSGListView::Vertical)
+    if (orientation == QQuickListView::Vertical)
         QCOMPARE(listview->contentY(), endExtent);
     else
         QCOMPARE(listview->contentX(), endExtent);
@@ -3921,11 +3921,11 @@ void tst_QSGListView::snapToItem()
     do {
         flick(canvas, flickEnd, flickStart, 180);
         QTRY_VERIFY(listview->isMoving() == false); // wait until it stops
-    } while (orientation == QSGListView::Vertical
+    } while (orientation == QQuickListView::Vertical
            ? !listview->isAtYBeginning()
            : layoutDirection == Qt::LeftToRight ? !listview->isAtXBeginning() : !listview->isAtXEnd());
 
-    if (orientation == QSGListView::Vertical)
+    if (orientation == QQuickListView::Vertical)
         QCOMPARE(listview->contentY(), startExtent);
     else
         QCOMPARE(listview->contentX(), startExtent);
@@ -3933,141 +3933,141 @@ void tst_QSGListView::snapToItem()
     delete canvas;
 }
 
-void tst_QSGListView::qListModelInterface_items()
+void tst_QQuickListView::qListModelInterface_items()
 {
     items<TestModel>();
 }
 
-void tst_QSGListView::qAbstractItemModel_items()
+void tst_QQuickListView::qAbstractItemModel_items()
 {
     items<TestModel2>();
 }
 
-void tst_QSGListView::qListModelInterface_changed()
+void tst_QQuickListView::qListModelInterface_changed()
 {
     changed<TestModel>();
 }
 
-void tst_QSGListView::qAbstractItemModel_changed()
+void tst_QQuickListView::qAbstractItemModel_changed()
 {
     changed<TestModel2>();
 }
 
-void tst_QSGListView::qListModelInterface_inserted()
+void tst_QQuickListView::qListModelInterface_inserted()
 {
     inserted<TestModel>();
 }
 
-void tst_QSGListView::qListModelInterface_inserted_more()
+void tst_QQuickListView::qListModelInterface_inserted_more()
 {
     inserted_more<TestModel>();
 }
 
-void tst_QSGListView::qListModelInterface_inserted_more_data()
+void tst_QQuickListView::qListModelInterface_inserted_more_data()
 {
     inserted_more_data();
 }
 
-void tst_QSGListView::qAbstractItemModel_inserted()
+void tst_QQuickListView::qAbstractItemModel_inserted()
 {
     inserted<TestModel2>();
 }
 
-void tst_QSGListView::qAbstractItemModel_inserted_more()
+void tst_QQuickListView::qAbstractItemModel_inserted_more()
 {
     inserted_more<TestModel2>();
 }
 
-void tst_QSGListView::qAbstractItemModel_inserted_more_data()
+void tst_QQuickListView::qAbstractItemModel_inserted_more_data()
 {
     inserted_more_data();
 }
 
-void tst_QSGListView::qListModelInterface_removed()
+void tst_QQuickListView::qListModelInterface_removed()
 {
     removed<TestModel>(false);
     removed<TestModel>(true);
 }
 
-void tst_QSGListView::qAbstractItemModel_removed()
+void tst_QQuickListView::qAbstractItemModel_removed()
 {
     removed<TestModel2>(false);
     removed<TestModel2>(true);
 }
 
-void tst_QSGListView::qListModelInterface_moved()
+void tst_QQuickListView::qListModelInterface_moved()
 {
     moved<TestModel>();
 }
 
-void tst_QSGListView::qListModelInterface_moved_data()
+void tst_QQuickListView::qListModelInterface_moved_data()
 {
     moved_data();
 }
 
-void tst_QSGListView::qAbstractItemModel_moved()
+void tst_QQuickListView::qAbstractItemModel_moved()
 {
     moved<TestModel2>();
 }
 
-void tst_QSGListView::qAbstractItemModel_moved_data()
+void tst_QQuickListView::qAbstractItemModel_moved_data()
 {
     moved_data();
 }
 
-void tst_QSGListView::qListModelInterface_clear()
+void tst_QQuickListView::qListModelInterface_clear()
 {
     clear<TestModel>();
 }
 
-void tst_QSGListView::qAbstractItemModel_clear()
+void tst_QQuickListView::qAbstractItemModel_clear()
 {
     clear<TestModel2>();
 }
 
-void tst_QSGListView::creationContext()
+void tst_QQuickListView::creationContext()
 {
-    QSGView canvas;
+    QQuickView canvas;
     canvas.setGeometry(0,0,240,320);
     canvas.setSource(QUrl::fromLocalFile(TESTDATA("creationContext.qml")));
     qApp->processEvents();
 
-    QSGItem *rootItem = qobject_cast<QSGItem *>(canvas.rootObject());
+    QQuickItem *rootItem = qobject_cast<QQuickItem *>(canvas.rootObject());
     QVERIFY(rootItem);
     QVERIFY(rootItem->property("count").toInt() > 0);
 
-    QSGItem *item;
-    QVERIFY(item = rootItem->findChild<QSGItem *>("listItem"));
+    QQuickItem *item;
+    QVERIFY(item = rootItem->findChild<QQuickItem *>("listItem"));
     QCOMPARE(item->property("text").toString(), QString("Hello!"));
-    QVERIFY(item = rootItem->findChild<QSGItem *>("header"));
+    QVERIFY(item = rootItem->findChild<QQuickItem *>("header"));
     QCOMPARE(item->property("text").toString(), QString("Hello!"));
-    QVERIFY(item = rootItem->findChild<QSGItem *>("footer"));
+    QVERIFY(item = rootItem->findChild<QQuickItem *>("footer"));
     QCOMPARE(item->property("text").toString(), QString("Hello!"));
-    QVERIFY(item = rootItem->findChild<QSGItem *>("section"));
+    QVERIFY(item = rootItem->findChild<QQuickItem *>("section"));
     QCOMPARE(item->property("text").toString(), QString("Hello!"));
 }
 
-void tst_QSGListView::QTBUG_21742()
+void tst_QQuickListView::QTBUG_21742()
 {
-    QSGView canvas;
+    QQuickView canvas;
     canvas.setGeometry(0,0,200,200);
     canvas.setSource(QUrl::fromLocalFile(TESTDATA("qtbug-21742.qml")));
     qApp->processEvents();
 
-    QSGItem *rootItem = qobject_cast<QSGItem *>(canvas.rootObject());
+    QQuickItem *rootItem = qobject_cast<QQuickItem *>(canvas.rootObject());
     QVERIFY(rootItem);
     QCOMPARE(rootItem->property("count").toInt(), 1);
 }
 
-QSGView *tst_QSGListView::createView()
+QQuickView *tst_QQuickListView::createView()
 {
-    QSGView *canvas = new QSGView(0);
+    QQuickView *canvas = new QQuickView(0);
     canvas->setGeometry(0,0,240,320);
 
     return canvas;
 }
 
-void tst_QSGListView::flick(QSGView *canvas, const QPoint &from, const QPoint &to, int duration)
+void tst_QQuickListView::flick(QQuickView *canvas, const QPoint &from, const QPoint &to, int duration)
 {
     const int pointCount = 5;
     QPoint diff = to - from;
@@ -4086,10 +4086,10 @@ void tst_QSGListView::flick(QSGView *canvas, const QPoint &from, const QPoint &t
 }
 
 
-QSGItem *tst_QSGListView::findVisibleChild(QSGItem *parent, const QString &objectName)
+QQuickItem *tst_QQuickListView::findVisibleChild(QQuickItem *parent, const QString &objectName)
 {
-    QSGItem *item = 0;
-    QList<QSGItem*> items = parent->findChildren<QSGItem*>(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);
@@ -4103,12 +4103,12 @@ QSGItem *tst_QSGListView::findVisibleChild(QSGItem *parent, const QString &objec
    item must also evaluate the {index} expression equal to index
 */
 template<typename T>
-T *tst_QSGListView::findItem(QSGItem *parent, const QString &objectName, int index)
+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) {
-        QSGItem *item = qobject_cast<QSGItem*>(parent->childItems().at(i));
+        QQuickItem *item = qobject_cast<QQuickItem*>(parent->childItems().at(i));
         if (!item)
             continue;
         //qDebug() << "try" << item;
@@ -4130,13 +4130,13 @@ T *tst_QSGListView::findItem(QSGItem *parent, const QString &objectName, int ind
 }
 
 template<typename T>
-QList<T*> tst_QSGListView::findItems(QSGItem *parent, const QString &objectName)
+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) {
-        QSGItem *item = qobject_cast<QSGItem*>(parent->childItems().at(i));
+        QQuickItem *item = qobject_cast<QQuickItem*>(parent->childItems().at(i));
         if (!item || !item->isVisible())
             continue;
         //qDebug() << "try" << item;
@@ -4148,11 +4148,11 @@ QList<T*> tst_QSGListView::findItems(QSGItem *parent, const QString &objectName)
     return items;
 }
 
-void tst_QSGListView::dumpTree(QSGItem *parent, int depth)
+void tst_QQuickListView::dumpTree(QQuickItem *parent, int depth)
 {
     static QString padding("                       ");
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QSGItem *item = qobject_cast<QSGItem*>(parent->childItems().at(i));
+        QQuickItem *item = qobject_cast<QQuickItem*>(parent->childItems().at(i));
         if (!item)
             continue;
         qDebug() << padding.left(depth*2) << item;
@@ -4160,7 +4160,7 @@ void tst_QSGListView::dumpTree(QSGItem *parent, int depth)
     }
 }
 
-QTEST_MAIN(tst_QSGListView)
+QTEST_MAIN(tst_QQuickListView)
 
-#include "tst_qsglistview.moc"
+#include "tst_qquicklistview.moc"