diff options
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative_core/tst_category.qml | 3 | ||||
| -rw-r--r-- | tests/auto/declarative_core/tst_categorymodel.qml | 12 | ||||
| -rw-r--r-- | tests/auto/declarative_core/utils.js | 12 |
3 files changed, 14 insertions, 13 deletions
diff --git a/tests/auto/declarative_core/tst_category.qml b/tests/auto/declarative_core/tst_category.qml index 51809dc3..f0a14d6f 100644 --- a/tests/auto/declarative_core/tst_category.qml +++ b/tests/auto/declarative_core/tst_category.qml @@ -27,6 +27,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQml.Models 2.14 import QtTest 1.0 import QtLocation 5.3 import "utils.js" as Utils @@ -100,7 +101,7 @@ TestCase { visibility: Place.DeviceVisibility } - VisualDataModel { + DelegateModel { id: categoryModel model: CategoryModel { diff --git a/tests/auto/declarative_core/tst_categorymodel.qml b/tests/auto/declarative_core/tst_categorymodel.qml index 86d0fd4c..59ec3e7c 100644 --- a/tests/auto/declarative_core/tst_categorymodel.qml +++ b/tests/auto/declarative_core/tst_categorymodel.qml @@ -74,9 +74,9 @@ TestCase { function test_hierarchicalModel() { var modelSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); - var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.3;' - + 'VisualDataModel { model: CategoryModel {} delegate: Item {} }', - testCase, "VisualDataModel"); + var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtQml.Models 2.14; import QtLocation 5.3;' + + 'DelegateModel { model: CategoryModel {} delegate: Item {} }', + testCase, "DelegateModel"); modelSpy.target = categoryModel.model; modelSpy.signalName = "statusChanged"; @@ -147,9 +147,9 @@ TestCase { function test_flatModel() { var modelSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); - var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtLocation 5.3;' - + 'VisualDataModel { model: CategoryModel {} delegate: Item {} }', - testCase, "VisualDataModel"); + var categoryModel = Qt.createQmlObject('import QtQuick 2.0; import QtQml.Models 2.14; import QtLocation 5.3;' + + 'DelegateModel { model: CategoryModel {} delegate: Item {} }', + testCase, "DelegateModel"); modelSpy.target = categoryModel.model; modelSpy.signalName = "statusChanged"; diff --git a/tests/auto/declarative_core/utils.js b/tests/auto/declarative_core/utils.js index 5370bab5..2b7dca32 100644 --- a/tests/auto/declarative_core/utils.js +++ b/tests/auto/declarative_core/utils.js @@ -97,8 +97,8 @@ function testConsecutiveFetch(testCase, model, place, expectedValues, data) signalSpy.target = model; signalSpy.signalName ="totalCountChanged"; - var visDataModel = Qt.createQmlObject('import QtQuick 2.0; ' - + 'VisualDataModel{ delegate: Text{} }', + var visDataModel = Qt.createQmlObject('import QtQuick 2.0; import QtQml.Models 2.14; ' + + 'DelegateModel{ delegate: Text{} }', testCase, "dataModel"); visDataModel.model = model; @@ -140,8 +140,8 @@ function testConsecutiveFetch(testCase, model, place, expectedValues, data) function testReset(testCase, model, place) { - var dataModel = Qt.createQmlObject('import QtQuick 2.0; ' - + 'VisualDataModel{ delegate: Text{} }', + var dataModel = Qt.createQmlObject('import QtQuick 2.0; import QtQml.Models 2.14; ' + + 'DelegateModel{ delegate: Text{} }', testCase, "dataModel"); dataModel.model = model; @@ -160,8 +160,8 @@ function testReset(testCase, model, place) function testFetch(testCase, data) { var model = data.model; - var visDataModel = Qt.createQmlObject('import QtQuick 2.0; ' - + 'VisualDataModel{ delegate: Text{} }', + var visDataModel = Qt.createQmlObject('import QtQuick 2.0; import QtQml.Models 2.14; ' + + 'DelegateModel{ delegate: Text{} }', testCase, "dataModel"); visDataModel.model = model |