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/testapplications | |
| 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/testapplications')
| -rw-r--r-- | tests/testapplications/elements/content/RepeaterElement.qml | 5 | ||||
| -rw-r--r-- | tests/testapplications/text/text.qml | 5 | ||||
| -rw-r--r-- | tests/testapplications/text/textedit.qml | 5 | ||||
| -rw-r--r-- | tests/testapplications/text/textinput.qml | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/tests/testapplications/elements/content/RepeaterElement.qml b/tests/testapplications/elements/content/RepeaterElement.qml index e825a0ac2c..fc4b3488ea 100644 --- a/tests/testapplications/elements/content/RepeaterElement.qml +++ b/tests/testapplications/elements/content/RepeaterElement.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -27,6 +27,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQml.Models 2.12 Item { id: repeaterelementtest @@ -48,7 +49,7 @@ Item { } - VisualItemModel { + ObjectModel { id: repeatermodel Rectangle { color: "blue"; height: 40; width: 150; border.color: "black"; border.width: 3; opacity: .9; radius: 5; clip: true Text { text: "I am Thing 1"; anchors.centerIn: parent } } diff --git a/tests/testapplications/text/text.qml b/tests/testapplications/text/text.qml index d2a8cff181..1737e70f30 100644 --- a/tests/testapplications/text/text.qml +++ b/tests/testapplications/text/text.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -27,6 +27,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQml.Models 2.12 Rectangle { height: 360; width: 640 @@ -105,7 +106,7 @@ Rectangle { anchors.right: parent.right Rectangle { anchors.fill: parent; color: "transparent"; border.color: "black" } ListView { id: controls; model: controlsmodel; anchors.fill: parent; clip: true; cacheBuffer: 500 } - VisualItemModel { + ObjectModel { id: controlsmodel ControlView { id: textvalue diff --git a/tests/testapplications/text/textedit.qml b/tests/testapplications/text/textedit.qml index 677784a978..b96193307a 100644 --- a/tests/testapplications/text/textedit.qml +++ b/tests/testapplications/text/textedit.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -27,6 +27,7 @@ ****************************************************************************/ import QtQuick 2.1 +import QtQml.Models 2.12 Rectangle { height: 360; width: 640 @@ -102,7 +103,7 @@ Rectangle { anchors.right: parent.right Rectangle { anchors.fill: parent; color: "transparent"; border.color: "black" } ListView { id: controls; model: controlsmodel; anchors.fill: parent; clip: true; cacheBuffer: 500 } - VisualItemModel { + ObjectModel { id: controlsmodel ControlView { id: textvalue diff --git a/tests/testapplications/text/textinput.qml b/tests/testapplications/text/textinput.qml index f1f9c7ac4f..72e6d83931 100644 --- a/tests/testapplications/text/textinput.qml +++ b/tests/testapplications/text/textinput.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -27,6 +27,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQml.Models 2.12 Rectangle { height: 360; width: 640 @@ -148,7 +149,7 @@ Rectangle { anchors.right: parent.right Rectangle { anchors.fill: parent; color: "transparent"; border.color: "black" } ListView { id: controls; model: controlsmodel; anchors.fill: parent; clip: true; cacheBuffer: 500 } - VisualItemModel { + ObjectModel { id: controlsmodel ControlView { id: textvalue |