diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-10-03 08:55:13 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-10-05 21:58:05 +0000 |
| commit | b22cb209e706317f12416df1a1e8a8a19a271827 (patch) | |
| tree | 93106ec43998d4aa10efe8a7c359bd80e3e6496f /tests/auto/quick/qquickgridview | |
| parent | 2dda8dcb2fc4851307d01af8336da2c8216b6360 (diff) | |
Replace obsolete VisualDataModel, *Group and VisualItemModel in tests
VisualDataModel, VisualDataGroup, and VisualItemModel
are replaced with DelegateModel, DelegateModelGroup, and ObjectModel
respectively (since 7cad0e52c5a020bd29635e9912fd8946a6b48124).
git grep -l 'VisualDataModel' | xargs sed -i 's/VisualDataModel/DelegateModel/g'
git grep -l 'VisualDataGroup' | xargs sed -i 's/VisualDataGroup/DelegateModelGroup/g'
git grep -l 'VisualItemModel' | xargs sed -i 's/VisualItemModel/ObjectModel/g'
Change-Id: Ie91b37b204f08a5d1f1f38594fb22ed70a6e2080
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickgridview')
| -rw-r--r-- | tests/auto/quick/qquickgridview/data/mirroring.qml | 9 | ||||
| -rw-r--r-- | tests/auto/quick/qquickgridview/data/unrequestedItems.qml | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickgridview/data/mirroring.qml b/tests/auto/quick/qquickgridview/data/mirroring.qml index b9aff501c1..b99f50b854 100644 --- a/tests/auto/quick/qquickgridview/data/mirroring.qml +++ b/tests/auto/quick/qquickgridview/data/mirroring.qml @@ -2,29 +2,30 @@ // changes in right-to-left layout direction import QtQuick 2.0 +import QtQml.Models 2.12 Rectangle { color: "lightgray" width: 340 height: 370 - VisualItemModel { + ObjectModel { id: itemModel objectName: "itemModel" Rectangle { objectName: "item1" height: 110; width: 120; color: "#FFFEF0" - Text { objectName: "text1"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent } + Text { objectName: "text1"; text: "index: " + parent.ObjectModel.index; font.bold: true; anchors.centerIn: parent } } Rectangle { objectName: "item2" height: 130; width: 150; color: "#F0FFF7" - Text { objectName: "text2"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent } + Text { objectName: "text2"; text: "index: " + parent.ObjectModel.index; font.bold: true; anchors.centerIn: parent } } Rectangle { objectName: "item3" height: 170; width: 190; color: "#F4F0FF" - Text { objectName: "text3"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent } + Text { objectName: "text3"; text: "index: " + parent.ObjectModel.index; font.bold: true; anchors.centerIn: parent } } } diff --git a/tests/auto/quick/qquickgridview/data/unrequestedItems.qml b/tests/auto/quick/qquickgridview/data/unrequestedItems.qml index bedb90b849..4afe5ac8b3 100644 --- a/tests/auto/quick/qquickgridview/data/unrequestedItems.qml +++ b/tests/auto/quick/qquickgridview/data/unrequestedItems.qml @@ -1,4 +1,5 @@ import QtQuick 2.0 +import QtQml.Models 2.12 Item { width: 240 @@ -38,7 +39,7 @@ Item { } - VisualDataModel { + DelegateModel { id: visualModel delegate: myDelegate |