Move the model classes from QtQuick to QtQml

This is needed for proper support of non-GUI instantiators in QtQml.
Only private C++ classes are affected. Aside from name changes, model
classes now operate on QObjects instead of QQuickItems, leading to minor
changes in the implementation of QtQuick classes using them.

The old QML type names will still be registered in the QtQuick import
for the forseeable future, but pointing to the new classes. The new QML
types will be added in a second commit.

Classes Affected:
QQuickVisualDataGroup -> QQmlDataGroup
QQuickVisualDataModel -> QQmlDelegateModel
QQuickVisualItemModel -> QQmlObjectModel
QQuickVisualModel -> QQmlInstanceModel
QQuickChangeSet -> QQmlChangeSet
QQuickListAccessor -> QQmlListAccessor
QQuickListCompositor -> QQmlListCompositor
QQuickPackage -> QQuickPackage (just moved for now)

Change-Id: Ia19e630e53bfa9e5d459e289596cd11df1ea3930
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>

9 files changed, 256 insertions, 257 deletions

diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 5d62b91094..da705cefdb 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -42,9 +42,9 @@ PRIVATETESTS += \
     qqmlvaluetypes \
     qqmlvaluetypeproviders \
     qqmlbinding \
-    qquickchangeset \
+    qqmlchangeset \
     qqmlconnections \
-    qquicklistcompositor \
+    qqmllistcompositor \
     qqmllistmodel \
     qqmllistmodelworkerscript \
     qquickworkerscript \
diff --git a/tests/auto/qml/qqmlchangeset/qqmlchangeset.pro b/tests/auto/qml/qqmlchangeset/qqmlchangeset.pro
new file mode 100644
index 0000000000..b65e58c0b3
--- /dev/null
+++ b/tests/auto/qml/qqmlchangeset/qqmlchangeset.pro
@@ -0,0 +1,10 @@
+CONFIG += testcase
+TARGET = tst_qqmlhangeset
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qqmlchangeset.cpp
+
+CONFIG += parallel_test
+
+QT += core-private gui-private qml-private testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qquickchangeset/tst_qquickchangeset.cpp b/tests/auto/qml/qqmlchangeset/tst_qqmlchangeset.cpp
index 77286b04b4..0f09de26d3 100644
--- a/tests/auto/qml/qquickchangeset/tst_qquickchangeset.cpp
+++ b/tests/auto/qml/qqmlchangeset/tst_qqmlchangeset.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <private/qquickchangeset_p.h>
+#include <private/qqmlchangeset_p.h>
 
-class tst_qquickchangeset : public QObject
+class tst_qqmlchangeset : public QObject
 {
     Q_OBJECT
 private slots:
@@ -140,7 +140,7 @@ public:
 
     bool applyChanges(QVector<int> &list, const QVector<Signal> &changes)
     {
-        QHash<QQuickChangeSet::MoveKey, int> removedValues;
+        QHash<QQmlChangeSet::MoveKey, int> removedValues;
         foreach (const Signal &signal, changes) {
             if (signal.isInsert()) {
                 if (signal.index < 0 || signal.index > list.count()) {
@@ -148,7 +148,7 @@ public:
                     return false;
                 }
                 if (signal.moveId != -1) {
-                    QQuickChangeSet::Insert insert(signal.index, signal.count, signal.moveId, signal.offset);
+                    QQmlChangeSet::Insert insert(signal.index, signal.count, signal.moveId, signal.offset);
                     for (int i = insert.start(); i < insert.end(); ++i)
                         list.insert(i, removedValues.take(insert.moveKey(i)));
                 } else {
@@ -160,7 +160,7 @@ public:
                     return false;
                 }
                 if (signal.moveId != -1) {
-                    QQuickChangeSet::Remove remove(signal.index, signal.count, signal.moveId, signal.offset);
+                    QQmlChangeSet::Remove remove(signal.index, signal.count, signal.moveId, signal.offset);
                     for (int i = remove.start(); i < remove.end(); ++i)
                         removedValues.insert(remove.moveKey(i), list.at(i));
                 }
@@ -184,7 +184,7 @@ public:
 
 };
 
-bool operator ==(const tst_qquickchangeset::Signal &left, const tst_qquickchangeset::Signal &right)
+bool operator ==(const tst_qqmlchangeset::Signal &left, const tst_qqmlchangeset::Signal &right)
 {
     return left.index == right.index
             && left.count == right.count
@@ -194,13 +194,13 @@ bool operator ==(const tst_qquickchangeset::Signal &left, const tst_qquickchange
 }
 
 QT_BEGIN_NAMESPACE
-bool operator ==(const QQuickChangeSet::Change &left, const QQuickChangeSet::Change &right)
+bool operator ==(const QQmlChangeSet::Change &left, const QQmlChangeSet::Change &right)
 {
     return left.index == right.index && left.count == right.count && left.moveId == right.moveId;
 }
 QT_END_NAMESPACE
 
-QDebug operator <<(QDebug debug, const tst_qquickchangeset::Signal &signal)
+QDebug operator <<(QDebug debug, const tst_qqmlchangeset::Signal &signal)
 {
     if (signal.isInsert() && signal.moveId == -1)
         debug.nospace() << "Insert(" << signal.index << "," << signal.count << ")";
@@ -217,8 +217,8 @@ QDebug operator <<(QDebug debug, const tst_qquickchangeset::Signal &signal)
     return debug;
 }
 
-Q_DECLARE_METATYPE(tst_qquickchangeset::SignalList)
-Q_DECLARE_METATYPE(tst_qquickchangeset::SignalListList)
+Q_DECLARE_METATYPE(tst_qqmlchangeset::SignalList)
+Q_DECLARE_METATYPE(tst_qqmlchangeset::SignalListList)
 
 #if 0
 # define VERIFY_EXPECTED_OUTPUT \
@@ -256,7 +256,7 @@ Q_DECLARE_METATYPE(tst_qquickchangeset::SignalListList)
     }
 #endif
 
-void tst_qquickchangeset::sequence_data()
+void tst_qqmlchangeset::sequence_data()
 {
     QTest::addColumn<SignalList>("input");
     QTest::addColumn<SignalList>("output");
@@ -1163,12 +1163,12 @@ void tst_qquickchangeset::sequence_data()
                 << Insert(24,1,5,9) << Insert(25,2) << Insert(27,2));
 }
 
-void tst_qquickchangeset::sequence()
+void tst_qqmlchangeset::sequence()
 {
     QFETCH(SignalList, input);
     QFETCH(SignalList, output);
 
-    QQuickChangeSet set;
+    QQmlChangeSet set;
 
     foreach (const Signal &signal, input) {
         if (signal.isRemove())
@@ -1182,18 +1182,18 @@ void tst_qquickchangeset::sequence()
     }
 
     SignalList changes;
-    foreach (const QQuickChangeSet::Remove &remove, set.removes())
+    foreach (const QQmlChangeSet::Remove &remove, set.removes())
         changes << Remove(remove.index, remove.count, remove.moveId, remove.offset);
-    foreach (const QQuickChangeSet::Insert &insert, set.inserts())
+    foreach (const QQmlChangeSet::Insert &insert, set.inserts())
         changes << Insert(insert.index, insert.count, insert.moveId, insert.offset);
-    foreach (const QQuickChangeSet::Change &change, set.changes())
+    foreach (const QQmlChangeSet::Change &change, set.changes())
         changes << Change(change.index, change.count);
 
     VERIFY_EXPECTED_OUTPUT
     QCOMPARE(changes, output);
 }
 
-void tst_qquickchangeset::apply_data()
+void tst_qqmlchangeset::apply_data()
 {
     QTest::addColumn<SignalListList>("input");
 
@@ -1297,15 +1297,15 @@ void tst_qquickchangeset::apply_data()
                 << (SignalList() << Move(38,23,1,3) << Move(38,31,0,4) << Remove(26,11) << Move(5,7,18,5) << Move(19,0,8,6)));
 }
 
-void tst_qquickchangeset::apply()
+void tst_qqmlchangeset::apply()
 {
     QFETCH(SignalListList, input);
 
-    QQuickChangeSet set;
-    QQuickChangeSet linearSet;
+    QQmlChangeSet set;
+    QQmlChangeSet linearSet;
 
     foreach (const SignalList &list, input) {
-        QQuickChangeSet intermediateSet;
+        QQmlChangeSet intermediateSet;
         foreach (const Signal &signal, list) {
             if (signal.isRemove()) {
                 intermediateSet.remove(signal.index, signal.count);
@@ -1322,15 +1322,15 @@ void tst_qquickchangeset::apply()
     }
 
     SignalList changes;
-    foreach (const QQuickChangeSet::Remove &remove, set.removes())
+    foreach (const QQmlChangeSet::Remove &remove, set.removes())
         changes << Remove(remove.index, remove.count, remove.moveId, remove.offset);
-    foreach (const QQuickChangeSet::Insert &insert, set.inserts())
+    foreach (const QQmlChangeSet::Insert &insert, set.inserts())
         changes << Insert(insert.index, insert.count, insert.moveId, insert.offset);
 
     SignalList linearChanges;
-    foreach (const QQuickChangeSet::Remove &remove, linearSet.removes())
+    foreach (const QQmlChangeSet::Remove &remove, linearSet.removes())
         linearChanges << Remove(remove.index, remove.count, remove.moveId, remove.offset);
-    foreach (const QQuickChangeSet::Insert &insert, linearSet.inserts())
+    foreach (const QQmlChangeSet::Insert &insert, linearSet.inserts())
         linearChanges << Insert(insert.index, insert.count, insert.moveId, insert.offset);
 
     // The output in the failing tests isn't incorrect, merely sub-optimal.
@@ -1343,7 +1343,7 @@ void tst_qquickchangeset::apply()
     QCOMPARE(changes, linearChanges);
 }
 
-void tst_qquickchangeset::removeConsecutive_data()
+void tst_qqmlchangeset::removeConsecutive_data()
 {
     QTest::addColumn<SignalList>("input");
     QTest::addColumn<SignalList>("output");
@@ -1359,22 +1359,22 @@ void tst_qquickchangeset::removeConsecutive_data()
             << (SignalList() << Remove(0,2) << Remove(0,1,0,0) << Remove(0,5));
 }
 
-void tst_qquickchangeset::removeConsecutive()
+void tst_qqmlchangeset::removeConsecutive()
 {
     QFETCH(SignalList, input);
     QFETCH(SignalList, output);
 
-    QVector<QQuickChangeSet::Remove> removes;
+    QVector<QQmlChangeSet::Remove> removes;
     foreach (const Signal &signal, input) {
         QVERIFY(signal.isRemove());
-        removes.append(QQuickChangeSet::Remove(signal.index, signal.count, signal.moveId, signal.offset));
+        removes.append(QQmlChangeSet::Remove(signal.index, signal.count, signal.moveId, signal.offset));
     }
 
-    QQuickChangeSet set;
+    QQmlChangeSet set;
     set.remove(removes);
 
     SignalList changes;
-    foreach (const QQuickChangeSet::Remove &remove, set.removes())
+    foreach (const QQmlChangeSet::Remove &remove, set.removes())
         changes << Remove(remove.index, remove.count, remove.moveId, remove.offset);
     QVERIFY(set.inserts().isEmpty());
     QVERIFY(set.changes().isEmpty());
@@ -1383,7 +1383,7 @@ void tst_qquickchangeset::removeConsecutive()
     QCOMPARE(changes, output);
 }
 
-void tst_qquickchangeset::insertConsecutive_data()
+void tst_qqmlchangeset::insertConsecutive_data()
 {
     QTest::addColumn<SignalList>("input");
     QTest::addColumn<SignalList>("output");
@@ -1399,22 +1399,22 @@ void tst_qquickchangeset::insertConsecutive_data()
             << (SignalList() << Insert(0,2) << Insert(2,1,0,0) << Insert(3,5));
 }
 
-void tst_qquickchangeset::insertConsecutive()
+void tst_qqmlchangeset::insertConsecutive()
 {
     QFETCH(SignalList, input);
     QFETCH(SignalList, output);
 
-    QVector<QQuickChangeSet::Insert> inserts;
+    QVector<QQmlChangeSet::Insert> inserts;
     foreach (const Signal &signal, input) {
         QVERIFY(signal.isInsert());
-        inserts.append(QQuickChangeSet::Insert(signal.index, signal.count, signal.moveId, signal.offset));
+        inserts.append(QQmlChangeSet::Insert(signal.index, signal.count, signal.moveId, signal.offset));
     }
 
-    QQuickChangeSet set;
+    QQmlChangeSet set;
     set.insert(inserts);
 
     SignalList changes;
-    foreach (const QQuickChangeSet::Insert &insert, set.inserts())
+    foreach (const QQmlChangeSet::Insert &insert, set.inserts())
         changes << Insert(insert.index, insert.count, insert.moveId, insert.offset);
     QVERIFY(set.removes().isEmpty());
     QVERIFY(set.changes().isEmpty());
@@ -1423,9 +1423,9 @@ void tst_qquickchangeset::insertConsecutive()
     QCOMPARE(changes, output);
 }
 
-void tst_qquickchangeset::copy()
+void tst_qqmlchangeset::copy()
 {
-    QQuickChangeSet changeSet;
+    QQmlChangeSet changeSet;
     changeSet.remove(0, 12);
     changeSet.remove(5, 4);
     changeSet.insert(3, 9);
@@ -1433,9 +1433,9 @@ void tst_qquickchangeset::copy()
     changeSet.change(24, 8);
     changeSet.move(3, 5, 9, 0);
 
-    QQuickChangeSet copy(changeSet);
+    QQmlChangeSet copy(changeSet);
 
-    QQuickChangeSet assign;
+    QQmlChangeSet assign;
     assign = changeSet;
 
     copy.move(4, 2, 5, 1);
@@ -1453,27 +1453,27 @@ void tst_qquickchangeset::copy()
     QCOMPARE(assign.difference(), changeSet.difference());
 }
 
-void tst_qquickchangeset::debug()
+void tst_qqmlchangeset::debug()
 {
-    QQuickChangeSet changeSet;
+    QQmlChangeSet changeSet;
     changeSet.remove(0, 12);
     changeSet.remove(5, 4);
     changeSet.insert(3, 9);
     changeSet.insert(15, 2);
     changeSet.change(24, 8);
 
-    QTest::ignoreMessage(QtDebugMsg, "QQuickChangeSet(Remove(0,12) Remove(5,4) Insert(3,9) Insert(15,2) Change(24,8) )");
+    QTest::ignoreMessage(QtDebugMsg, "QQmlChangeSet(Remove(0,12) Remove(5,4) Insert(3,9) Insert(15,2) Change(24,8) )");
     qDebug() << changeSet;
 
     changeSet.clear();
 
-    QTest::ignoreMessage(QtDebugMsg, "QQuickChangeSet(Remove(12,4,0,0) Insert(5,4,0,0) )");
+    QTest::ignoreMessage(QtDebugMsg, "QQmlChangeSet(Remove(12,4,0,0) Insert(5,4,0,0) )");
 
     changeSet.move(12, 5, 4, 0);
     qDebug() << changeSet;
 }
 
-void tst_qquickchangeset::random_data()
+void tst_qqmlchangeset::random_data()
 {
     QTest::addColumn<int>("seed");
     QTest::addColumn<int>("combinations");
@@ -1484,7 +1484,7 @@ void tst_qquickchangeset::random_data()
     QTest::newRow("3*5") << 32 << 3 << 5;
 }
 
-void tst_qquickchangeset::random()
+void tst_qqmlchangeset::random()
 {
     QFETCH(int, seed);
     QFETCH(int, combinations);
@@ -1494,14 +1494,14 @@ void tst_qquickchangeset::random()
 
     int failures = 0;
     for (int i = 0; i < 20000; ++i) {
-        QQuickChangeSet accumulatedSet;
+        QQmlChangeSet accumulatedSet;
         SignalList input;
 
         int modelCount = 40;
         int moveCount = 0;
 
         for (int j = 0; j < combinations; ++j) {
-            QQuickChangeSet set;
+            QQmlChangeSet set;
             for (int k = 0; k < depth; ++k) {
                 switch (-(qrand() % 3)) {
                 case InsertOp: {
@@ -1537,9 +1537,9 @@ void tst_qquickchangeset::random()
         }
 
         SignalList output;
-        foreach (const QQuickChangeSet::Remove &remove, accumulatedSet.removes())
+        foreach (const QQmlChangeSet::Remove &remove, accumulatedSet.removes())
             output << Remove(remove.index, remove.count, remove.moveId, remove.offset);
-        foreach (const QQuickChangeSet::Insert &insert, accumulatedSet.inserts())
+        foreach (const QQmlChangeSet::Insert &insert, accumulatedSet.inserts())
             output << Insert(insert.index, insert.count, insert.moveId, insert.offset);
 
         QVector<int> inputList;
@@ -1569,6 +1569,6 @@ void tst_qquickchangeset::random()
     QCOMPARE(failures, 0);
 }
 
-QTEST_MAIN(tst_qquickchangeset)
+QTEST_MAIN(tst_qqmlchangeset)
 
-#include "tst_qquickchangeset.moc"
+#include "tst_qqmlchangeset.moc"
diff --git a/tests/auto/qml/qquickchangeset/qquickchangeset.pro b/tests/auto/qml/qqmllistcompositor/qqmllistcompositor.pro
index fd8c87baa4..e6c9dc3a29 100644
--- a/tests/auto/qml/qquickchangeset/qquickchangeset.pro
+++ b/tests/auto/qml/qqmllistcompositor/qqmllistcompositor.pro
@@ -1,8 +1,8 @@
 CONFIG += testcase
-TARGET = tst_qquickchangeset
+TARGET = tst_qqmllistcompositor
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qquickchangeset.cpp
+SOURCES += tst_qqmllistcompositor.cpp
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/qml/qquicklistcompositor/tst_qquicklistcompositor.cpp b/tests/auto/qml/qqmllistcompositor/tst_qqmllistcompositor.cpp
index 5be501c94e..d5e85f478d 100644
--- a/tests/auto/qml/qquicklistcompositor/tst_qquicklistcompositor.cpp
+++ b/tests/auto/qml/qqmllistcompositor/tst_qqmllistcompositor.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <private/qquicklistcompositor_p.h>
+#include <private/qqmllistcompositor_p.h>
 
 template<typename T, int N> int lengthOf(const T (&)[N]) { return N; }
 
-typedef QQuickListCompositor C;
+typedef QQmlListCompositor C;
 
 struct Range
 {
@@ -70,9 +70,9 @@ template <typename T>  struct Array
 typedef Array<int> IndexArray;
 typedef Array<const void *> ListArray;
 
-typedef QVector<QQuickListCompositor::Remove> RemoveList;
-typedef QVector<QQuickListCompositor::Insert> InsertList;
-typedef QVector<QQuickListCompositor::Change> ChangeList;
+typedef QVector<QQmlListCompositor::Remove> RemoveList;
+typedef QVector<QQmlListCompositor::Insert> InsertList;
+typedef QVector<QQmlListCompositor::Change> ChangeList;
 
 typedef QVector<Range> RangeList;
 
@@ -102,7 +102,7 @@ QT_END_NAMESPACE
 static const C::Group Visible = C::Group(2);
 static const C::Group Selection = C::Group(3);
 
-class tst_qquicklistcompositor : public QObject
+class tst_qqmllistcompositor : public QObject
 {
     Q_OBJECT
 
@@ -174,7 +174,7 @@ private slots:
     void groupDebug();
 };
 
-void tst_qquicklistcompositor::find_data()
+void tst_qqmllistcompositor::find_data()
 {
     QTest::addColumn<RangeList>("ranges");
     QTest::addColumn<C::Group>("startGroup");
@@ -201,7 +201,7 @@ void tst_qquicklistcompositor::find_data()
             << uint(C::PrependFlag |  SelectionFlag | C::DefaultFlag | C::CacheFlag) << 0;
 }
 
-void tst_qquicklistcompositor::find()
+void tst_qqmllistcompositor::find()
 {
     QFETCH(RangeList, ranges);
     QFETCH(C::Group, startGroup);
@@ -215,7 +215,7 @@ void tst_qquicklistcompositor::find()
     QFETCH(uint, rangeFlags);
     QFETCH(int, rangeIndex);
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
 
@@ -224,7 +224,7 @@ void tst_qquicklistcompositor::find()
 
     compositor.find(startGroup, startIndex);
 
-    QQuickListCompositor::iterator it = compositor.find(group, index);
+    QQmlListCompositor::iterator it = compositor.find(group, index);
     QCOMPARE(it.index[C::Cache], cacheIndex);
     QCOMPARE(it.index[C::Default], defaultIndex);
     QCOMPARE(it.index[Visible], visibleIndex);
@@ -233,7 +233,7 @@ void tst_qquicklistcompositor::find()
     QCOMPARE(it->index, rangeIndex);
 }
 
-void tst_qquicklistcompositor::findInsertPosition_data()
+void tst_qqmllistcompositor::findInsertPosition_data()
 {
     QTest::addColumn<RangeList>("ranges");
     QTest::addColumn<C::Group>("group");
@@ -265,7 +265,7 @@ void tst_qquicklistcompositor::findInsertPosition_data()
             << uint(0) << 0;
 }
 
-void tst_qquicklistcompositor::findInsertPosition()
+void tst_qqmllistcompositor::findInsertPosition()
 {
     QFETCH(RangeList, ranges);
     QFETCH(C::Group, group);
@@ -277,14 +277,14 @@ void tst_qquicklistcompositor::findInsertPosition()
     QFETCH(uint, rangeFlags);
     QFETCH(int, rangeIndex);
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
 
     foreach (const Range &range, ranges)
         compositor.append(range.list, range.index, range.count, range.flags);
 
-    QQuickListCompositor::insert_iterator it = compositor.findInsertPosition(group, index);
+    QQmlListCompositor::insert_iterator it = compositor.findInsertPosition(group, index);
 
     QCOMPARE(it.index[C::Cache], cacheIndex);
     QCOMPARE(it.index[C::Default], defaultIndex);
@@ -294,9 +294,9 @@ void tst_qquicklistcompositor::findInsertPosition()
     QCOMPARE(it->index, rangeIndex);
 }
 
-void tst_qquicklistcompositor::insert()
+void tst_qqmllistcompositor::insert()
 {
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
 
@@ -383,7 +383,7 @@ void tst_qquicklistcompositor::insert()
     }
 }
 
-void tst_qquicklistcompositor::clearFlags_data()
+void tst_qqmllistcompositor::clearFlags_data()
 {
     QTest::addColumn<RangeList>("ranges");
     QTest::addColumn<C::Group>("group");
@@ -518,7 +518,7 @@ void tst_qquicklistcompositor::clearFlags_data()
     }
 }
 
-void tst_qquicklistcompositor::clearFlags()
+void tst_qqmllistcompositor::clearFlags()
 {
     QFETCH(RangeList, ranges);
     QFETCH(C::Group, group);
@@ -535,7 +535,7 @@ void tst_qquicklistcompositor::clearFlags()
     QFETCH(IndexArray, selectionIndexes);
     QFETCH(ListArray, selectionLists);
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
 
@@ -577,7 +577,7 @@ void tst_qquicklistcompositor::clearFlags()
     }
 }
 
-void tst_qquicklistcompositor::setFlags_data()
+void tst_qqmllistcompositor::setFlags_data()
 {
     QTest::addColumn<RangeList>("ranges");
     QTest::addColumn<C::Group>("group");
@@ -700,7 +700,7 @@ void tst_qquicklistcompositor::setFlags_data()
     }
 }
 
-void tst_qquicklistcompositor::setFlags()
+void tst_qqmllistcompositor::setFlags()
 {
     QFETCH(RangeList, ranges);
     QFETCH(C::Group, group);
@@ -717,7 +717,7 @@ void tst_qquicklistcompositor::setFlags()
     QFETCH(IndexArray, selectionIndexes);
     QFETCH(ListArray, selectionLists);
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
 
@@ -759,7 +759,7 @@ void tst_qquicklistcompositor::setFlags()
     }
 }
 
-void tst_qquicklistcompositor::move_data()
+void tst_qqmllistcompositor::move_data()
 {
     QTest::addColumn<RangeList>("ranges");
     QTest::addColumn<C::Group>("fromGroup");
@@ -985,7 +985,7 @@ void tst_qquicklistcompositor::move_data()
     }
 }
 
-void tst_qquicklistcompositor::move()
+void tst_qqmllistcompositor::move()
 {
     QFETCH(RangeList, ranges);
     QFETCH(C::Group, fromGroup);
@@ -1004,7 +1004,7 @@ void tst_qquicklistcompositor::move()
     QFETCH(IndexArray, selectionIndexes);
     QFETCH(ListArray, selectionLists);
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
 
@@ -1048,11 +1048,11 @@ void tst_qquicklistcompositor::move()
     }
 }
 
-void tst_qquicklistcompositor::moveFromEnd()
+void tst_qqmllistcompositor::moveFromEnd()
 {
     int listA; void *a = &listA;
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.append(a, 0, 1, C::AppendFlag | C::PrependFlag | C::DefaultFlag);
 
     // Moving an item anchors it to that position.
@@ -1074,9 +1074,9 @@ void tst_qquicklistcompositor::moveFromEnd()
     QCOMPARE(it.modelIndex(), 0);
 }
 
-void tst_qquicklistcompositor::clear()
+void tst_qqmllistcompositor::clear()
 {
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
 
@@ -1097,7 +1097,7 @@ void tst_qquicklistcompositor::clear()
     QCOMPARE(compositor.count(C::Cache), 0);
 }
 
-void tst_qquicklistcompositor::listItemsInserted_data()
+void tst_qqmllistcompositor::listItemsInserted_data()
 {
     QTest::addColumn<RangeList>("ranges");
     QTest::addColumn<void *>("list");
@@ -1226,7 +1226,7 @@ void tst_qquicklistcompositor::listItemsInserted_data()
     }
 }
 
-void tst_qquicklistcompositor::listItemsInserted()
+void tst_qqmllistcompositor::listItemsInserted()
 {
     QFETCH(RangeList, ranges);
     QFETCH(void *, list);
@@ -1238,7 +1238,7 @@ void tst_qquicklistcompositor::listItemsInserted()
     QFETCH(IndexArray, visibleIndexes);
     QFETCH(IndexArray, selectionIndexes);
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
 
@@ -1276,7 +1276,7 @@ void tst_qquicklistcompositor::listItemsInserted()
     }
 }
 
-void tst_qquicklistcompositor::listItemsRemoved_data()
+void tst_qqmllistcompositor::listItemsRemoved_data()
 {
     QTest::addColumn<RangeList>("ranges");
     QTest::addColumn<void *>("list");
@@ -1362,7 +1362,7 @@ void tst_qquicklistcompositor::listItemsRemoved_data()
     }
 }
 
-void tst_qquicklistcompositor::listItemsRemoved()
+void tst_qqmllistcompositor::listItemsRemoved()
 {
     QFETCH(RangeList, ranges);
     QFETCH(void *, list);
@@ -1374,7 +1374,7 @@ void tst_qquicklistcompositor::listItemsRemoved()
     QFETCH(IndexArray, visibleIndexes);
     QFETCH(IndexArray, selectionIndexes);
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
 
@@ -1412,7 +1412,7 @@ void tst_qquicklistcompositor::listItemsRemoved()
     }
 }
 
-void tst_qquicklistcompositor::listItemsMoved_data()
+void tst_qqmllistcompositor::listItemsMoved_data()
 {
     QTest::addColumn<RangeList>("ranges");
     QTest::addColumn<void *>("list");
@@ -1554,7 +1554,7 @@ void tst_qquicklistcompositor::listItemsMoved_data()
     }
 }
 
-void tst_qquicklistcompositor::listItemsMoved()
+void tst_qqmllistcompositor::listItemsMoved()
 {
     QFETCH(RangeList, ranges);
     QFETCH(void *, list);
@@ -1568,7 +1568,7 @@ void tst_qquicklistcompositor::listItemsMoved()
     QFETCH(IndexArray, visibleIndexes);
     QFETCH(IndexArray, selectionIndexes);
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
 
@@ -1608,7 +1608,7 @@ void tst_qquicklistcompositor::listItemsMoved()
     }
 }
 
-void tst_qquicklistcompositor::listItemsChanged_data()
+void tst_qqmllistcompositor::listItemsChanged_data()
 {
     QTest::addColumn<RangeList>("ranges");
     QTest::addColumn<void *>("list");
@@ -1640,7 +1640,7 @@ void tst_qquicklistcompositor::listItemsChanged_data()
                 << Change(0, 0, 3, 6, 2, C::DefaultFlag | C::CacheFlag));
 }
 
-void tst_qquicklistcompositor::listItemsChanged()
+void tst_qqmllistcompositor::listItemsChanged()
 {
     QFETCH(RangeList, ranges);
     QFETCH(void *, list);
@@ -1648,7 +1648,7 @@ void tst_qquicklistcompositor::listItemsChanged()
     QFETCH(int, count);
     QFETCH(ChangeList, expectedChanges);
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
 
@@ -1661,12 +1661,12 @@ void tst_qquicklistcompositor::listItemsChanged()
     QCOMPARE(changes, expectedChanges);
 }
 
-void tst_qquicklistcompositor::compositorDebug()
+void tst_qqmllistcompositor::compositorDebug()
 {
     void *a = (void *)0xa0;
     void *b = (void *)0xb0;
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
     compositor.append(a, 0, 2, C::PrependFlag | C::DefaultFlag);
@@ -1676,7 +1676,7 @@ void tst_qquicklistcompositor::compositorDebug()
     compositor.append(a, 2, 3, C::DefaultFlag);
 
     QTest::ignoreMessage(QtDebugMsg,
-            "QQuickListCompositor(00110\n"
+            "QQmlListCompositor(00110\n"
             " 0 0 0 0   Range(0xa0 0 2 00P000000000D0\n"
             " 0 0 2 0   Range(0xa0 2 3 00P00000000000\n"
             " 0 0 2 0   Range(0xa0 5 2 0AP000000000D0\n"
@@ -1687,7 +1687,7 @@ void tst_qquicklistcompositor::compositorDebug()
     compositor.setFlags(C::Default, 5, 2, SelectionFlag);
 
     QTest::ignoreMessage(QtDebugMsg,
-            "QQuickListCompositor(20110\n"
+            "QQmlListCompositor(20110\n"
             " 0 0 0 0   Range(0xa0 0 2 00P000000000D0\n"
             " 0 0 2 0   Range(0xa0 2 3 00P00000000000\n"
             " 0 0 2 0   Range(0xa0 5 2 0AP000000000D0\n"
@@ -1698,12 +1698,12 @@ void tst_qquicklistcompositor::compositorDebug()
     qDebug() << compositor;
 }
 
-void tst_qquicklistcompositor::changeDebug()
+void tst_qqmllistcompositor::changeDebug()
 {
     void *a = (void *)0xa0;
     void *b = (void *)0xb0;
 
-    QQuickListCompositor compositor;
+    QQmlListCompositor compositor;
     compositor.setGroupCount(4);
     compositor.setDefaultGroups(VisibleFlag | C::DefaultFlag);
     compositor.append(a, 0, 2, C::PrependFlag | C::DefaultFlag);
@@ -1716,14 +1716,14 @@ void tst_qquicklistcompositor::changeDebug()
 
 
     QTest::ignoreMessage(QtDebugMsg, "Change(-1 2 000000010D0 2 0 7 0)");
-    qDebug() << QQuickListCompositor::Change(compositor.find(C::Default, 7), 2, SelectionFlag | C::DefaultFlag);
+    qDebug() << QQmlListCompositor::Change(compositor.find(C::Default, 7), 2, SelectionFlag | C::DefaultFlag);
     QTest::ignoreMessage(QtDebugMsg, "Remove(9 4 000000000D0 10 0)");
-    qDebug() << QQuickListCompositor::Remove(compositor.find(C::Default, 10), 4, C::DefaultFlag, 9);
+    qDebug() << QQmlListCompositor::Remove(compositor.find(C::Default, 10), 4, C::DefaultFlag, 9);
     QTest::ignoreMessage(QtDebugMsg, "Insert(9 4 000000000D0 3 0)");
-    qDebug() << QQuickListCompositor::Insert(compositor.find(C::Default, 3), 4, C::DefaultFlag, 9);
+    qDebug() << QQmlListCompositor::Insert(compositor.find(C::Default, 3), 4, C::DefaultFlag, 9);
 }
 
-void tst_qquicklistcompositor::groupDebug()
+void tst_qqmllistcompositor::groupDebug()
 {
     QTest::ignoreMessage(QtDebugMsg, "Default ");
     qDebug() << C::Default;
@@ -1733,8 +1733,8 @@ void tst_qquicklistcompositor::groupDebug()
     qDebug() << Selection;
 }
 
-QTEST_MAIN(tst_qquicklistcompositor)
+QTEST_MAIN(tst_qqmllistcompositor)
 
-#include "tst_qquicklistcompositor.moc"
+#include "tst_qqmllistcompositor.moc"
 
 
diff --git a/tests/auto/qml/qquicklistcompositor/qquicklistcompositor.pro b/tests/auto/qml/qquicklistcompositor/qquicklistcompositor.pro
deleted file mode 100644
index 9d1d2bd237..0000000000
--- a/tests/auto/qml/qquicklistcompositor/qquicklistcompositor.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qquicklistcompositor
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qquicklistcompositor.cpp
-
-CONFIG += parallel_test
-
-QT += core-private gui-private qml-private quick-private testlib
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index aee4e0d119..5c0bbb1e21 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -51,7 +51,6 @@
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickgridview_p.h>
 #include <QtQuick/private/qquicktext_p.h>
-#include <QtQuick/private/qquickvisualitemmodel_p.h>
 #include <QtQml/private/qqmllistmodel_p.h>
 #include "../../shared/util.h"
 #include "../shared/viewtestutil.h"
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index a1b2536b0b..9bcf9d6333 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -48,7 +48,7 @@
 #include <QtQml/qqmlincubator.h>
 #include <QtQuick/private/qquicklistview_p.h>
 #include <QtQuick/private/qquicktext_p.h>
-#include <QtQuick/private/qquickvisualitemmodel_p.h>
+#include <QtQml/private/qqmlobjectmodel_p.h>
 #include <QtQml/private/qqmllistmodel_p.h>
 #include "../../shared/util.h"
 #include "../shared/viewtestutil.h"
@@ -2767,7 +2767,7 @@ void tst_QQuickListView::itemList()
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
-    QQuickVisualItemModel *model = window->rootObject()->findChild<QQuickVisualItemModel*>("itemModel");
+    QQmlObjectModel *model = window->rootObject()->findChild<QQmlObjectModel*>("itemModel");
     QTRY_VERIFY(model != 0);
 
     QTRY_VERIFY(model->count() == 3);
@@ -2808,7 +2808,7 @@ void tst_QQuickListView::itemListFlicker()
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != 0);
 
-    QQuickVisualItemModel *model = window->rootObject()->findChild<QQuickVisualItemModel*>("itemModel");
+    QQmlObjectModel *model = window->rootObject()->findChild<QQmlObjectModel*>("itemModel");
     QTRY_VERIFY(model != 0);
 
     QTRY_VERIFY(model->count() == 3);
@@ -4605,7 +4605,7 @@ void tst_QQuickListView::rightToLeft()
 
     QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
 
-    QQuickVisualItemModel *model = window->rootObject()->findChild<QQuickVisualItemModel*>("itemModel");
+    QQmlObjectModel *model = window->rootObject()->findChild<QQmlObjectModel*>("itemModel");
     QTRY_VERIFY(model != 0);
 
     QTRY_VERIFY(model->count() == 3);
diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index 74c557871f..f97b0f35a6 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -52,9 +52,9 @@
 #include <QtQuick/qquickview.h>
 #include <private/qquicklistview_p.h>
 #include <QtQuick/private/qquicktext_p.h>
-#include <QtQuick/private/qquickvisualdatamodel_p.h>
+#include <QtQml/private/qqmldelegatemodel_p.h>
 #include <private/qqmlvaluetype_p.h>
-#include <private/qquickchangeset_p.h>
+#include <private/qqmlchangeset_p.h>
 #include <private/qqmlengine_p.h>
 #include <math.h>
 #include <QtGui/qstandarditemmodel.h>
@@ -360,21 +360,21 @@ public:
     int indexCreated;
 
 public Q_SLOTS:
-    void initItem(int index, QQuickItem *item)
+    void initItem(int index, QObject *item)
     {
-        itemInitialized = item;
+        itemInitialized = qobject_cast<QQuickItem*>(item);
         indexInitialized = index;
     }
 
-    void createdItem(int index, QQuickItem *item)
+    void createdItem(int index, QObject *item)
     {
-        itemCreated = item;
+        itemCreated = qobject_cast<QQuickItem*>(item);
         indexCreated = index;
     }
 
-    void destroyingItem(QQuickItem *item)
+    void destroyingItem(QObject *item)
     {
-        itemDestroyed = item;
+        itemDestroyed = qobject_cast<QQuickItem*>(item);
     }
 };
 
@@ -452,9 +452,9 @@ private:
 
     template <int N> void get_verify(
             const SingleRoleModel &model,
-            QQuickVisualDataModel *visualModel,
-            QQuickVisualDataGroup *visibleItems,
-            QQuickVisualDataGroup *selectedItems,
+            QQmlDelegateModel *visualModel,
+            QQmlDataGroup *visibleItems,
+            QQmlDataGroup *selectedItems,
             const int (&mIndex)[N],
             const int (&iIndex)[N],
             const int (&vIndex)[N],
@@ -467,7 +467,7 @@ private:
     QQmlEngine engine;
 };
 
-Q_DECLARE_METATYPE(QQuickChangeSet)
+Q_DECLARE_METATYPE(QQmlChangeSet)
 
 template <typename T> static T evaluate(QObject *scope, const QString &expression)
 {
@@ -489,7 +489,7 @@ template <> void evaluate<void>(QObject *scope, const QString &expression)
 void tst_qquickvisualdatamodel::initTestCase()
 {
     QQmlDataTest::initTestCase();
-    qRegisterMetaType<QQuickChangeSet>();
+    qRegisterMetaType<QQmlChangeSet>();
 
     qmlRegisterType<SingleRoleModel>("tst_qquickvisualdatamodel", 1, 0, "SingleRoleModel");
     qmlRegisterType<DataObject>("tst_qquickvisualdatamodel", 1, 0, "DataObject");
@@ -517,7 +517,7 @@ void tst_qquickvisualdatamodel::rootIndex()
 
     engine.rootContext()->setContextProperty("myModel", &model);
 
-    QQuickVisualDataModel *obj = qobject_cast<QQuickVisualDataModel*>(c.create());
+    QQmlDelegateModel *obj = qobject_cast<QQmlDelegateModel*>(c.create());
     QVERIFY(obj != 0);
 
     QMetaObject::invokeMethod(obj, "setRoot");
@@ -611,7 +611,7 @@ void tst_qquickvisualdatamodel::childChanged()
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QQuickVisualDataModel *vdm = listview->findChild<QQuickVisualDataModel*>("visualModel");
+    QQmlDelegateModel *vdm = listview->findChild<QQmlDelegateModel*>("visualModel");
     vdm->setRootIndex(QVariant::fromValue(model.indexFromItem(model.item(1,0))));
     QCOMPARE(listview->count(), 1);
 
@@ -922,7 +922,7 @@ void tst_qquickvisualdatamodel::noDelegate()
     QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
     QVERIFY(listview != 0);
 
-    QQuickVisualDataModel *vdm = listview->findChild<QQuickVisualDataModel*>("visualModel");
+    QQmlDelegateModel *vdm = listview->findChild<QQmlDelegateModel*>("visualModel");
     QVERIFY(vdm != 0);
     QCOMPARE(vdm->count(), 3);
 
@@ -1052,15 +1052,15 @@ void tst_qquickvisualdatamodel::qaimRowsMoved()
     SingleRoleModel model(list);
     engine.rootContext()->setContextProperty("myModel", &model);
 
-    QQuickVisualDataModel *obj = qobject_cast<QQuickVisualDataModel*>(c.create());
+    QQmlDelegateModel *obj = qobject_cast<QQmlDelegateModel*>(c.create());
     QVERIFY(obj != 0);
 
-    QSignalSpy spy(obj, SIGNAL(modelUpdated(QQuickChangeSet,bool)));
+    QSignalSpy spy(obj, SIGNAL(modelUpdated(QQmlChangeSet,bool)));
     model.emitMove(sourceFirst, sourceLast, destinationChild);
     QCOMPARE(spy.count(), 1);
 
     QCOMPARE(spy[0].count(), 2);
-    QQuickChangeSet changeSet = spy[0][0].value<QQuickChangeSet>();
+    QQmlChangeSet changeSet = spy[0][0].value<QQmlChangeSet>();
     QCOMPARE(changeSet.removes().count(), 1);
     QCOMPARE(changeSet.removes().at(0).index, expectFrom);
     QCOMPARE(changeSet.removes().at(0).count, expectCount);
@@ -1115,11 +1115,11 @@ void tst_qquickvisualdatamodel::subtreeRowsMoved()
     QQmlComponent component(&engine, testFileUrl("visualdatamodel.qml"));
 
     QScopedPointer<QObject> object(component.create());
-    QQuickVisualDataModel *vdm = qobject_cast<QQuickVisualDataModel*>(object.data());
+    QQmlDelegateModel *vdm = qobject_cast<QQmlDelegateModel*>(object.data());
     QVERIFY(vdm);
 
-    QSignalSpy spy(vdm, SIGNAL(modelUpdated(QQuickChangeSet,bool)));
-    QQuickChangeSet changeSet;
+    QSignalSpy spy(vdm, SIGNAL(modelUpdated(QQmlChangeSet,bool)));
+    QQmlChangeSet changeSet;
 
     QCOMPARE(vdm->count(), 4);
 
@@ -1127,7 +1127,7 @@ void tst_qquickvisualdatamodel::subtreeRowsMoved()
     model.move(QModelIndex(), 1, model.index(0, 0), 3, 2);
     QCOMPARE(vdm->count(), 2);
     QCOMPARE(spy.count(), 1);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.removes().count(), 1);
     QCOMPARE(changeSet.removes().at(0).index, 1);
     QCOMPARE(changeSet.removes().at(0).count, 2);
@@ -1137,7 +1137,7 @@ void tst_qquickvisualdatamodel::subtreeRowsMoved()
     model.move(model.index(0, 0), 4, QModelIndex(), 2, 1);
     QCOMPARE(vdm->count(), 3);
     QCOMPARE(spy.count(), 2);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.removes().count(), 0);
     QCOMPARE(changeSet.inserts().count(), 1);
     QCOMPARE(changeSet.inserts().at(0).index, 2);
@@ -1147,11 +1147,11 @@ void tst_qquickvisualdatamodel::subtreeRowsMoved()
     QCOMPARE(vdm->rootIndex().value<QModelIndex>(), model.index(2, 0));
     QCOMPARE(vdm->count(), 3);
     QCOMPARE(spy.count(), 4);
-    changeSet = spy.at(2).at(0).value<QQuickChangeSet>();
+    changeSet = spy.at(2).at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.removes().count(), 1);
     QCOMPARE(changeSet.removes().at(0).index, 0);
     QCOMPARE(changeSet.removes().at(0).count, 3);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.inserts().count(), 1);
     QCOMPARE(changeSet.inserts().at(0).index, 0);
     QCOMPARE(changeSet.inserts().at(0).count, 3);
@@ -1182,7 +1182,7 @@ void tst_qquickvisualdatamodel::subtreeRowsMoved()
     QCOMPARE(vdm->rootIndex().value<QModelIndex>(), QModelIndex());
     QCOMPARE(vdm->count(), 0);
     QCOMPARE(spy.count(), 5);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.removes().count(), 1);
     QCOMPARE(changeSet.removes().at(0).index, 0);
     QCOMPARE(changeSet.removes().at(0).count, 3);
@@ -1192,7 +1192,7 @@ void tst_qquickvisualdatamodel::subtreeRowsMoved()
     QCOMPARE(vdm->rootIndex().value<QModelIndex>(), QModelIndex());
     QCOMPARE(vdm->count(), 2);
     QCOMPARE(spy.count(), 6);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.removes().count(), 0);
     QCOMPARE(changeSet.inserts().count(), 1);
     QCOMPARE(changeSet.inserts().at(0).index, 0);
@@ -1211,17 +1211,17 @@ void tst_qquickvisualdatamodel::watchedRoles()
     QQmlComponent component(&engine, testFileUrl("visualdatamodel.qml"));
 
     QScopedPointer<QObject> object(component.create());
-    QQuickVisualDataModel *vdm = qobject_cast<QQuickVisualDataModel*>(object.data());
+    QQmlDelegateModel *vdm = qobject_cast<QQmlDelegateModel*>(object.data());
     QVERIFY(vdm);
 
     // VisualDataModel doesn't initialize model data until the first item is requested.
-    QQuickItem *item = vdm->item(0);
+    QQuickItem *item = qobject_cast<QQuickItem*>(vdm->object(0));
     QVERIFY(item);
     vdm->release(item);
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);  // Ensure released items are deleted before test exits.
 
-    QSignalSpy spy(vdm, SIGNAL(modelUpdated(QQuickChangeSet,bool)));
-    QQuickChangeSet changeSet;
+    QSignalSpy spy(vdm, SIGNAL(modelUpdated(QQmlChangeSet,bool)));
+    QQmlChangeSet changeSet;
 
     QCOMPARE(vdm->count(), 30);
 
@@ -1238,13 +1238,13 @@ void tst_qquickvisualdatamodel::watchedRoles()
 
     emit model.dataChanged(model.index(0), model.index(4));
     QCOMPARE(spy.count(), 1);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.changes().at(0).index, 0);
     QCOMPARE(changeSet.changes().at(0).count, 5);
 
     emit model.dataChanged(model.index(1), model.index(6), QVector<int>() << QaimModel::Name);
     QCOMPARE(spy.count(), 2);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.changes().at(0).index, 1);
     QCOMPARE(changeSet.changes().at(0).count, 6);
 
@@ -1255,7 +1255,7 @@ void tst_qquickvisualdatamodel::watchedRoles()
 
     emit model.dataChanged(model.index(0), model.index(4));
     QCOMPARE(spy.count(), 3);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.changes().at(0).index, 0);
     QCOMPARE(changeSet.changes().at(0).count, 5);
 
@@ -1264,7 +1264,7 @@ void tst_qquickvisualdatamodel::watchedRoles()
 
     emit model.dataChanged(model.index(8), model.index(8), QVector<int>() << QaimModel::Number);
     QCOMPARE(spy.count(), 4);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.changes().at(0).index, 8);
     QCOMPARE(changeSet.changes().at(0).count, 1);
 
@@ -1272,19 +1272,19 @@ void tst_qquickvisualdatamodel::watchedRoles()
 
     emit model.dataChanged(model.index(0), model.index(4));
     QCOMPARE(spy.count(), 5);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.changes().at(0).index, 0);
     QCOMPARE(changeSet.changes().at(0).count, 5);
 
     emit model.dataChanged(model.index(1), model.index(6), QVector<int>() << QaimModel::Name);
     QCOMPARE(spy.count(), 6);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.changes().at(0).index, 1);
     QCOMPARE(changeSet.changes().at(0).count, 6);
 
     emit model.dataChanged(model.index(8), model.index(8), QVector<int>() << QaimModel::Number);
     QCOMPARE(spy.count(), 7);
-    changeSet = spy.last().at(0).value<QQuickChangeSet>();
+    changeSet = spy.last().at(0).value<QQmlChangeSet>();
     QCOMPARE(changeSet.changes().at(0).index, 8);
     QCOMPARE(changeSet.changes().at(0).count, 1);
 }
@@ -1301,29 +1301,29 @@ void tst_qquickvisualdatamodel::hasModelChildren()
     QQmlComponent component(&engine, testFileUrl("visualdatamodel.qml"));
 
     QScopedPointer<QObject> object(component.create());
-    QQuickVisualDataModel *vdm = qobject_cast<QQuickVisualDataModel*>(object.data());
+    QQmlDelegateModel *vdm = qobject_cast<QQmlDelegateModel*>(object.data());
     QVERIFY(vdm);
 
     QCOMPARE(vdm->count(), 4);
 
     QQuickItem *item = 0;
 
-    item = vdm->item(0);
+    item = qobject_cast<QQuickItem*>(vdm->object(0));
     QVERIFY(item);
     QCOMPARE(item->property("modelChildren").toBool(), true);
     vdm->release(item);
 
-    item = vdm->item(1);
+    item = qobject_cast<QQuickItem*>(vdm->object(1));
     QVERIFY(item);
     QCOMPARE(item->property("modelChildren").toBool(), false);
     vdm->release(item);
 
-    item = vdm->item(2);
+    item = qobject_cast<QQuickItem*>(vdm->object(2));
     QVERIFY(item);
     QCOMPARE(item->property("modelChildren").toBool(), true);
     vdm->release(item);
 
-    item = vdm->item(3);
+    item = qobject_cast<QQuickItem*>(vdm->object(3));
     QVERIFY(item);
     QCOMPARE(item->property("modelChildren").toBool(), false);
     vdm->release(item);
@@ -1351,14 +1351,14 @@ void tst_qquickvisualdatamodel::setValue()
     QQmlComponent component(&engine, testFileUrl("visualdatamodel.qml"));
 
     QScopedPointer<QObject> object(component.create());
-    QQuickVisualDataModel *vdm = qobject_cast<QQuickVisualDataModel*>(object.data());
+    QQmlDelegateModel *vdm = qobject_cast<QQmlDelegateModel*>(object.data());
     QVERIFY(vdm);
 
     QCOMPARE(vdm->count(), 3);
 
     QQuickItem *item = 0;
 
-    item = vdm->item(0);
+    item = qobject_cast<QQuickItem*>(vdm->object(0));
     QVERIFY(item);
     QCOMPARE(evaluate<QString>(item, "display"), QString("Row 1 Item"));
     evaluate<void>(item, "display = 'Changed Item 1'");
@@ -1412,7 +1412,7 @@ void tst_qquickvisualdatamodel::remove()
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
+    QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel *>(qvariant_cast<QObject *>(listview->model()));
     QVERIFY(visualModel);
 
     {
@@ -1521,7 +1521,7 @@ void tst_qquickvisualdatamodel::move()
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
+    QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel *>(qvariant_cast<QObject *>(listview->model()));
     QVERIFY(visualModel);
 
     {
@@ -1710,13 +1710,13 @@ void tst_qquickvisualdatamodel::groups()
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QQuickVisualDataModel *visualModel = listview->findChild<QQuickVisualDataModel *>("visualModel");
+    QQmlDelegateModel *visualModel = listview->findChild<QQmlDelegateModel *>("visualModel");
     QVERIFY(visualModel);
 
-    QQuickVisualDataGroup *visibleItems = listview->findChild<QQuickVisualDataGroup *>("visibleItems");
+    QQmlDataGroup *visibleItems = listview->findChild<QQmlDataGroup *>("visibleItems");
     QVERIFY(visibleItems);
 
-    QQuickVisualDataGroup *selectedItems = listview->findChild<QQuickVisualDataGroup *>("selectedItems");
+    QQmlDataGroup *selectedItems = listview->findChild<QQmlDataGroup *>("selectedItems");
     QVERIFY(selectedItems);
 
     const bool f = false;
@@ -1939,9 +1939,9 @@ void tst_qquickvisualdatamodel::groups()
 
 template <int N> void tst_qquickvisualdatamodel::get_verify(
         const SingleRoleModel &model,
-        QQuickVisualDataModel *visualModel,
-        QQuickVisualDataGroup *visibleItems,
-        QQuickVisualDataGroup *selectedItems,
+        QQmlDelegateModel *visualModel,
+        QQmlDataGroup *visibleItems,
+        QQmlDataGroup *selectedItems,
         const int (&mIndex)[N],
         const int (&iIndex)[N],
         const int (&vIndex)[N],
@@ -2030,13 +2030,13 @@ void tst_qquickvisualdatamodel::get()
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
+    QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel *>(qvariant_cast<QObject *>(listview->model()));
     QVERIFY(visualModel);
 
-    QQuickVisualDataGroup *visibleItems = visualModel->findChild<QQuickVisualDataGroup *>("visibleItems");
+    QQmlDataGroup *visibleItems = visualModel->findChild<QQmlDataGroup *>("visibleItems");
     QVERIFY(visibleItems);
 
-    QQuickVisualDataGroup *selectedItems = visualModel->findChild<QQuickVisualDataGroup *>("selectedItems");
+    QQmlDataGroup *selectedItems = visualModel->findChild<QQmlDataGroup *>("selectedItems");
     QVERIFY(selectedItems);
 
     QV8Engine *v8Engine = QQmlEnginePrivate::getV8Engine(ctxt->engine());
@@ -2154,7 +2154,7 @@ void tst_qquickvisualdatamodel::get()
 void tst_qquickvisualdatamodel::invalidGroups()
 {
     QUrl source = testFileUrl("groups-invalid.qml");
-    QTest::ignoreMessage(QtWarningMsg, (source.toString() + ":12:9: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("Group names must start with a lower case letter")).toUtf8());
+    QTest::ignoreMessage(QtWarningMsg, (source.toString() + ":12:9: QML VisualDataGroup: " + QQmlDataGroup::tr("Group names must start with a lower case letter")).toUtf8());
 
     QQmlComponent component(&engine, source);
     QScopedPointer<QObject> object(component.create());
@@ -2326,7 +2326,7 @@ void tst_qquickvisualdatamodel::create()
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
+    QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel *>(qvariant_cast<QObject *>(listview->model()));
     QVERIFY(visualModel);
 
     QCOMPARE(listview->count(), 20);
@@ -2440,7 +2440,7 @@ void tst_qquickvisualdatamodel::incompleteModel()
 
     QScopedPointer<QObject> object(component.beginCreate(engine.rootContext()));
 
-    QQuickVisualDataModel *model = qobject_cast<QQuickVisualDataModel *>(object.data());
+    QQmlDelegateModel *model = qobject_cast<QQmlDelegateModel *>(object.data());
     QVERIFY(model);
 
     QSignalSpy itemsSpy(model->items(), SIGNAL(countChanged()));
@@ -3665,67 +3665,67 @@ void tst_qquickvisualdatamodel::warnings_data()
     QTest::newRow("insert < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.insert(-2, {\"number\": \"eight\"})")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("insert: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("insert: index out of range"))
             << 4;
 
     QTest::newRow("insert > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.insert(8, {\"number\": \"eight\"})")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("insert: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("insert: index out of range"))
             << 4;
 
     QTest::newRow("create < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.create(-2, {\"number\": \"eight\"})")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("create: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("create: index out of range"))
             << 4;
 
     QTest::newRow("create > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.create(8, {\"number\": \"eight\"})")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("create: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("create: index out of range"))
             << 4;
 
     QTest::newRow("resolve from < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.resolve(-2, 3)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("resolve: from index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: from index out of range"))
             << 4;
 
     QTest::newRow("resolve from > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.resolve(8, 3)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("resolve: from index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: from index out of range"))
             << 4;
 
     QTest::newRow("resolve to < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.resolve(3, -2)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("resolve: to index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: to index out of range"))
             << 4;
 
     QTest::newRow("resolve to > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.resolve(3, 8)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("resolve: to index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: to index out of range"))
             << 4;
 
     QTest::newRow("resolve from invalid index")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.resolve(\"two\", 3)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("resolve: from index invalid"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: from index invalid"))
             << 4;
 
     QTest::newRow("resolve to invalid index")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.resolve(3, \"two\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("resolve: to index invalid"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: to index invalid"))
             << 4;
 
     QTest::newRow("resolve already resolved item")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.resolve(3, 2)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("resolve: from is not an unresolved item"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: from is not an unresolved item"))
             << 4;
 
     QTest::newRow("resolve already resolved item")
@@ -3733,193 +3733,193 @@ void tst_qquickvisualdatamodel::warnings_data()
             << QString("{ items.insert(0, {\"number\": \"eight\"});"
                        "items.insert(1, {\"number\": \"seven\"});"
                        "items.resolve(0, 1)}")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("resolve: to is not a model item"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("resolve: to is not a model item"))
             << 6;
 
     QTest::newRow("remove index < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.remove(-2, 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("remove: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("remove: index out of range"))
             << 4;
 
     QTest::newRow("remove index == length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.remove(4, 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("remove: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("remove: index out of range"))
             << 4;
 
     QTest::newRow("remove index > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.remove(9, 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("remove: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("remove: index out of range"))
             << 4;
 
     QTest::newRow("remove invalid index")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.remove(\"nine\", 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("remove: invalid index"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("remove: invalid index"))
             << 4;
 
     QTest::newRow("remove count < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.remove(1, -2)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("remove: invalid count"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("remove: invalid count"))
             << 4;
 
     QTest::newRow("remove index + count > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.remove(2, 4, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("remove: invalid count"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("remove: invalid count"))
             << 4;
 
     QTest::newRow("addGroups index < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.addGroups(-2, 1, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("addGroups: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("addGroups: index out of range"))
             << 4;
 
     QTest::newRow("addGroups index == length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.addGroups(4, 1, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("addGroups: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("addGroups: index out of range"))
             << 4;
 
     QTest::newRow("addGroups index > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.addGroups(9, 1, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("addGroups: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("addGroups: index out of range"))
             << 4;
 
     QTest::newRow("addGroups count < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.addGroups(1, -2, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("addGroups: invalid count"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("addGroups: invalid count"))
             << 4;
 
     QTest::newRow("addGroups index + count > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.addGroups(2, 4, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("addGroups: invalid count"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("addGroups: invalid count"))
             << 4;
 
     QTest::newRow("removeGroups index < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.removeGroups(-2, 1, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("removeGroups: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("removeGroups: index out of range"))
             << 4;
 
     QTest::newRow("removeGroups index == length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.removeGroups(4, 1, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("removeGroups: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("removeGroups: index out of range"))
             << 4;
 
     QTest::newRow("removeGroups index > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.removeGroups(9, 1, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("removeGroups: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("removeGroups: index out of range"))
             << 4;
 
     QTest::newRow("removeGroups count < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.removeGroups(1, -2, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("removeGroups: invalid count"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("removeGroups: invalid count"))
             << 4;
 
     QTest::newRow("removeGroups index + count > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.removeGroups(2, 4, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("removeGroups: invalid count"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("removeGroups: invalid count"))
             << 4;
 
     QTest::newRow("setGroups index < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.setGroups(-2, 1, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("setGroups: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("setGroups: index out of range"))
             << 4;
 
     QTest::newRow("setGroups index == length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.setGroups(4, 1, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("setGroups: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("setGroups: index out of range"))
             << 4;
 
     QTest::newRow("setGroups index > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.setGroups(9, 1, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("setGroups: index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("setGroups: index out of range"))
             << 4;
 
     QTest::newRow("setGroups count < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.setGroups(1, -2, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("setGroups: invalid count"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("setGroups: invalid count"))
             << 4;
 
     QTest::newRow("setGroups index + count > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.setGroups(2, 4, \"selected\")")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("setGroups: invalid count"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("setGroups: invalid count"))
             << 4;
 
     QTest::newRow("move from < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.move(-2, 1, 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("move: from index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("move: from index out of range"))
             << 4;
 
     QTest::newRow("move from == length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.move(4, 1, 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("move: from index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("move: from index out of range"))
             << 4;
 
     QTest::newRow("move from > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.move(9, 1, 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("move: from index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("move: from index out of range"))
             << 4;
 
     QTest::newRow("move invalid from")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.move(\"nine\", 1, 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("move: invalid from index"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("move: invalid from index"))
             << 4;
 
     QTest::newRow("move to < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.move(1, -2, 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("move: to index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("move: to index out of range"))
             << 4;
 
     QTest::newRow("move to == length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.move(1, 4, 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("move: to index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("move: to index out of range"))
             << 4;
 
     QTest::newRow("move to > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.move(1, 9, 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("move: to index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("move: to index out of range"))
             << 4;
 
     QTest::newRow("move invalid to")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.move(1, \"nine\", 1)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("move: invalid to index"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("move: invalid to index"))
             << 4;
 
     QTest::newRow("move count < 0")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.move(1, 1, -2)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("move: invalid count"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("move: invalid count"))
             << 4;
 
     QTest::newRow("move from + count > length")
             << testFileUrl("listmodelproperties.qml")
             << QString("items.move(2, 1, 4)")
-            << ("<Unknown File>: QML VisualDataGroup: " + QQuickVisualDataGroup::tr("move: from index out of range"))
+            << ("<Unknown File>: QML VisualDataGroup: " + QQmlDataGroup::tr("move: from index out of range"))
             << 4;
 }
 
@@ -3961,19 +3961,19 @@ void tst_qquickvisualdatamodel::invalidAttachment()
     QCOMPARE(component.errors().count(), 0);
 
     QVariant property = object->property("invalidVdm");
-    QCOMPARE(property.userType(), qMetaTypeId<QQuickVisualDataModel *>());
-    QVERIFY(!property.value<QQuickVisualDataModel *>());
+    QCOMPARE(property.userType(), qMetaTypeId<QQmlDelegateModel *>());
+    QVERIFY(!property.value<QQmlDelegateModel *>());
 
     QQuickItem *item = findItem<QQuickItem>(static_cast<QQuickItem *>(object.data()), "delegate");
     QVERIFY(item);
 
     property = item->property("validVdm");
-    QCOMPARE(property.userType(), qMetaTypeId<QQuickVisualDataModel *>());
-    QVERIFY(property.value<QQuickVisualDataModel *>());
+    QCOMPARE(property.userType(), qMetaTypeId<QQmlDelegateModel *>());
+    QVERIFY(property.value<QQmlDelegateModel *>());
 
     property = item->property("invalidVdm");
-    QCOMPARE(property.userType(), qMetaTypeId<QQuickVisualDataModel *>());
-    QVERIFY(!property.value<QQuickVisualDataModel *>());
+    QCOMPARE(property.userType(), qMetaTypeId<QQmlDelegateModel *>());
+    QVERIFY(!property.value<QQmlDelegateModel *>());
 }
 
 void tst_qquickvisualdatamodel::asynchronousInsert_data()
@@ -4005,15 +4005,15 @@ void tst_qquickvisualdatamodel::asynchronousInsert()
 
     engine.rootContext()->setContextProperty("myModel", &model);
 
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel*>(c.create());
+    QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(c.create());
     QVERIFY(visualModel);
 
     ItemRequester requester;
-    connect(visualModel, SIGNAL(initItem(int,QQuickItem*)), &requester, SLOT(initItem(int,QQuickItem*)));
-    connect(visualModel, SIGNAL(createdItem(int,QQuickItem*)), &requester, SLOT(createdItem(int,QQuickItem*)));
-    connect(visualModel, SIGNAL(destroyingItem(QQuickItem*)), &requester, SLOT(destroyingItem(QQuickItem*)));
+    connect(visualModel, SIGNAL(initItem(int,QObject*)), &requester, SLOT(initItem(int,QObject*)));
+    connect(visualModel, SIGNAL(createdItem(int,QObject*)), &requester, SLOT(createdItem(int,QObject*)));
+    connect(visualModel, SIGNAL(destroyingItem(QObject*)), &requester, SLOT(destroyingItem(QObject*)));
 
-    QQuickItem *item = visualModel->item(requestIndex, true);
+    QQuickItem *item = qobject_cast<QQuickItem*>(visualModel->object(requestIndex, true));
     QVERIFY(!item);
 
     QVERIFY(!requester.itemInitialized);
@@ -4025,7 +4025,7 @@ void tst_qquickvisualdatamodel::asynchronousInsert()
         newItems.append(qMakePair(QLatin1String("New item") + QString::number(i), QString(QLatin1String(""))));
     model.insertItems(insertIndex, newItems);
 
-    item = visualModel->item(completeIndex, false);
+    item = qobject_cast<QQuickItem*>(visualModel->object(completeIndex, false));
     QVERIFY(item);
 
     QCOMPARE(requester.itemInitialized, item);
@@ -4070,15 +4070,15 @@ void tst_qquickvisualdatamodel::asynchronousRemove()
 
     engine.rootContext()->setContextProperty("myModel", &model);
 
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel*>(c.create());
+    QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(c.create());
     QVERIFY(visualModel);
 
     ItemRequester requester;
-    connect(visualModel, SIGNAL(initItem(int,QQuickItem*)), &requester, SLOT(initItem(int,QQuickItem*)));
-    connect(visualModel, SIGNAL(createdItem(int,QQuickItem*)), &requester, SLOT(createdItem(int,QQuickItem*)));
-    connect(visualModel, SIGNAL(destroyingItem(QQuickItem*)), &requester, SLOT(destroyingItem(QQuickItem*)));
+    connect(visualModel, SIGNAL(initItem(int,QObject*)), &requester, SLOT(initItem(int,QObject*)));
+    connect(visualModel, SIGNAL(createdItem(int,QObject*)), &requester, SLOT(createdItem(int,QObject*)));
+    connect(visualModel, SIGNAL(destroyingItem(QObject*)), &requester, SLOT(destroyingItem(QObject*)));
 
-    QQuickItem *item = visualModel->item(requestIndex, true);
+    QQuickItem *item = qobject_cast<QQuickItem*>(visualModel->object(requestIndex, true));
     QVERIFY(!item);
 
     QVERIFY(!requester.itemInitialized);
@@ -4098,7 +4098,7 @@ void tst_qquickvisualdatamodel::asynchronousRemove()
         QCOMPARE(requester.itemCreated, requester.itemInitialized);
         QCOMPARE(requester.itemDestroyed, requester.itemInitialized);
     } else {
-        item = visualModel->item(completeIndex, false);
+        item = qobject_cast<QQuickItem*>(visualModel->object(completeIndex, false));
         QVERIFY(item);
 
         QCOMPARE(requester.itemInitialized, item);
@@ -4148,15 +4148,15 @@ void tst_qquickvisualdatamodel::asynchronousMove()
 
     engine.rootContext()->setContextProperty("myModel", &model);
 
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel*>(c.create());
+    QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(c.create());
     QVERIFY(visualModel);
 
     ItemRequester requester;
-    connect(visualModel, SIGNAL(initItem(int,QQuickItem*)), &requester, SLOT(initItem(int,QQuickItem*)));
-    connect(visualModel, SIGNAL(createdItem(int,QQuickItem*)), &requester, SLOT(createdItem(int,QQuickItem*)));
-    connect(visualModel, SIGNAL(destroyingItem(QQuickItem*)), &requester, SLOT(destroyingItem(QQuickItem*)));
+    connect(visualModel, SIGNAL(initItem(int,QObject*)), &requester, SLOT(initItem(int,QObject*)));
+    connect(visualModel, SIGNAL(createdItem(int,QObject*)), &requester, SLOT(createdItem(int,QObject*)));
+    connect(visualModel, SIGNAL(destroyingItem(QObject*)), &requester, SLOT(destroyingItem(QObject*)));
 
-    QQuickItem *item = visualModel->item(requestIndex, true);
+    QQuickItem *item = qobject_cast<QQuickItem*>(visualModel->object(requestIndex, true));
     QVERIFY(!item);
 
     QVERIFY(!requester.itemInitialized);
@@ -4165,7 +4165,7 @@ void tst_qquickvisualdatamodel::asynchronousMove()
 
     model.moveItems(from, to, count);
 
-    item = visualModel->item(completeIndex, false);
+    item = qobject_cast<QQuickItem*>(visualModel->object(completeIndex, false));
     QVERIFY(item);
 
 
@@ -4196,10 +4196,10 @@ void tst_qquickvisualdatamodel::asynchronousCancel()
 
     engine.rootContext()->setContextProperty("myModel", &model);
 
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel*>(c.create());
+    QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(c.create());
     QVERIFY(visualModel);
 
-    QQuickItem *item = visualModel->item(requestIndex, true);
+    QQuickItem *item = qobject_cast<QQuickItem*>(visualModel->object(requestIndex, true));
     QVERIFY(!item);
     QCOMPARE(controller.incubatingObjectCount(), 1);
 
@@ -4221,10 +4221,10 @@ void tst_qquickvisualdatamodel::invalidContext()
     QQmlComponent c(&engine, testFileUrl("visualdatamodel.qml"));
 
 
-    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel*>(c.create(context.data()));
+    QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(c.create(context.data()));
     QVERIFY(visualModel);
 
-    QQuickItem *item = visualModel->item(4, false);
+    QQuickItem *item = qobject_cast<QQuickItem*>(visualModel->object(4, false));
     QVERIFY(item);
     visualModel->release(item);
 
@@ -4232,7 +4232,7 @@ void tst_qquickvisualdatamodel::invalidContext()
 
     model.insertItem(4, "new item", "");
 
-    item = visualModel->item(4, false);
+    item = qobject_cast<QQuickItem*>(visualModel->object(4, false));
     QVERIFY(!item);
 }