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/qquickpathview | |
| 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/qquickpathview')
4 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickpathview/data/panels.qml b/tests/auto/quick/qquickpathview/data/panels.qml index a111e45736..08e4636dca 100644 --- a/tests/auto/quick/qquickpathview/data/panels.qml +++ b/tests/auto/quick/qquickpathview/data/panels.qml @@ -1,4 +1,5 @@ import QtQuick 2.0 +import QtQml.Models 2.12 Item { id: root @@ -6,7 +7,7 @@ Item { property bool enforceRange: false width: 320; height: 480 - VisualItemModel { + ObjectModel { id: itemModel Rectangle { diff --git a/tests/auto/quick/qquickpathview/data/pathview_package.qml b/tests/auto/quick/qquickpathview/data/pathview_package.qml index 2af57e6bb1..34d4ee73ba 100644 --- a/tests/auto/quick/qquickpathview/data/pathview_package.qml +++ b/tests/auto/quick/qquickpathview/data/pathview_package.qml @@ -1,4 +1,5 @@ import QtQuick 2.0 +import QtQml.Models 2.12 Item { width: 800; height: 600 @@ -37,7 +38,7 @@ Item { ListElement { lColor: "brown" } ListElement { lColor: "thistle" } } - VisualDataModel { id: visualModel; model: rssModel; delegate: photoDelegate } + DelegateModel { id: visualModel; model: rssModel; delegate: photoDelegate } PathView { id: photoPathView diff --git a/tests/auto/quick/qquickpathview/data/treemodel.qml b/tests/auto/quick/qquickpathview/data/treemodel.qml index fcf6922d00..b1e06f47d2 100644 --- a/tests/auto/quick/qquickpathview/data/treemodel.qml +++ b/tests/auto/quick/qquickpathview/data/treemodel.qml @@ -1,4 +1,5 @@ import QtQuick 2.0 +import QtQml.Models 2.12 PathView { width: 320 @@ -6,7 +7,7 @@ PathView { function setRoot(index) { vdm.rootIndex = vdm.modelIndex(index); } - model: VisualDataModel { + model: DelegateModel { id: vdm model: myModel delegate: Text { objectName: "wrapper"; text: display } diff --git a/tests/auto/quick/qquickpathview/data/vdm.qml b/tests/auto/quick/qquickpathview/data/vdm.qml index 839393d9bd..f24837b7a6 100644 --- a/tests/auto/quick/qquickpathview/data/vdm.qml +++ b/tests/auto/quick/qquickpathview/data/vdm.qml @@ -1,4 +1,5 @@ import QtQuick 2.0 +import QtQml.Models 2.12 PathView { id: pathView @@ -20,7 +21,7 @@ PathView { ListElement { value: "three" } } - model: VisualDataModel { + model: DelegateModel { delegate: Text { text: model.value } model : mo } |