aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlitemmodels/data
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>2015-03-06 19:27:22 +0100
committerGabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>2015-03-22 16:20:29 +0000
commit0271609d5136fa681306c2647973a26dadc7acb3 (patch)
tree4889a233a919266fbf38551a056cf8b49d7f2bd4 /tests/auto/qml/qqmlitemmodels/data
parentae1c3eba3e7e11a9b1ab4d18792c82c9bb6e62de (diff)
Remove QItemSelection value-type, use Array instead
We implement this by adding QItemSelection to the set of sequence types. Change-Id: Ia3db376c806d8f062639e22c7f4bf392f114c266 Reviewed-by: Stephen Kelly <steveire@gmail.com>
Diffstat (limited to 'tests/auto/qml/qqmlitemmodels/data')
-rw-r--r--tests/auto/qml/qqmlitemmodels/data/itemselection.qml23
1 files changed, 8 insertions, 15 deletions
diff --git a/tests/auto/qml/qqmlitemmodels/data/itemselection.qml b/tests/auto/qml/qqmlitemmodels/data/itemselection.qml
index 57cb6436e9..c2da71627a 100644
--- a/tests/auto/qml/qqmlitemmodels/data/itemselection.qml
+++ b/tests/auto/qml/qqmlitemmodels/data/itemselection.qml
@@ -1,9 +1,10 @@
import Test 1.0
ItemModelsTest {
- property var itemSelection
property int count
property bool contains: false
+ property var itemSelectionBinding: itemSelection
+ property var itemSelectionRead
function range(top, bottom, left, right, parent) {
if (parent === undefined)
@@ -14,23 +15,15 @@ ItemModelsTest {
}
onModelChanged: {
- itemSelection = createItemSelection()
- itemSelection.prepend(range(0, 0, 0, 5))
- itemSelection.append(range(0, 5, 0, 0))
+ itemSelection = []
+ itemSelection.push(range(0, 0, 0, 5))
+ itemSelection.push(range(0, 5, 0, 0))
for (var i = 0; i < 3; i++)
- itemSelection.insert(i, range(i, i + 1, i + 2, i + 3))
+ itemSelection.splice(i, 0, range(i, i + 1, i + 2, i + 3))
- var itemSelection2 = createItemSelection()
- for (i = 3; i < 6; i++)
- itemSelection2.select(model.index(i, i + 1), model.index(i + 2, i + 3))
-
- itemSelection.merge(itemSelection2, 2 /*ItemSelectionModel.Select*/)
+ itemSelectionRead = itemSelection
count = itemSelection.length
- contains = itemSelection.contains(model.index(0, 0))
-
- itemSelection.removeAt(3)
- itemSelection.removeFirst()
- itemSelection.removeLast()
+ contains = itemSelection.some(function (range, idx) { return range.contains(model.index(0, 0)) })
}
}