diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 17:05:21 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 17:05:21 +0100 |
commit | 13e88fe2b9b1680cb161a249289c3ba998f08c0c (patch) | |
tree | 496a9d88c69b441e8c88aa0416b327faca3a1532 /tests/auto/quick/qquicklistview/data/listview-sections.qml | |
parent | a2dad3ddee9c4bf274a7c6469342e4104605ceeb (diff) | |
parent | 470ba767663e4ad9d3183fb56ee89361354dfefb (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/quick/items/qquickitem.cpp
src/quick/items/qquicktext.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
Change-Id: I0bc5786098193c2c40b6fd8905de75d90f6ed0cf
Diffstat (limited to 'tests/auto/quick/qquicklistview/data/listview-sections.qml')
-rw-r--r-- | tests/auto/quick/qquicklistview/data/listview-sections.qml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicklistview/data/listview-sections.qml b/tests/auto/quick/qquicklistview/data/listview-sections.qml index d5b8a4400d..e9fb83910a 100644 --- a/tests/auto/quick/qquicklistview/data/listview-sections.qml +++ b/tests/auto/quick/qquicklistview/data/listview-sections.qml @@ -1,6 +1,7 @@ import QtQuick 2.0 Rectangle { + property bool sectionsInvalidOnCompletion width: 240 height: 320 color: "#ffffff" @@ -9,6 +10,26 @@ Rectangle { id: myDelegate Item { id: wrapper + + function validateInitialSections() { + var invalid = false + if (index == 0) { + invalid |= wrapper.ListView.previousSection != "" + } + if (index == model.count - 1) { + invalid |= wrapper.ListView.nextSection != "" + } + if (index % 5 == 0 && index > 0) { + invalid |= wrapper.ListView.previousSection != Number(wrapper.ListView.section) - 1 + } else if ((index + 1) % 5 == 0 && index < model.count - 1) { + invalid |= wrapper.ListView.nextSection != Number(wrapper.ListView.section) + 1 + } else if (index > 0 && index < model.count - 1) { + invalid |= wrapper.ListView.previousSection != wrapper.ListView.section + invalid |= wrapper.ListView.nextSection != wrapper.ListView.section + } + sectionsInvalidOnCompletion |= invalid + } + objectName: "wrapper" height: ListView.previousSection != ListView.section ? 40 : 20; width: 240 @@ -49,6 +70,10 @@ Rectangle { visible: wrapper.ListView.previousSection != wrapper.ListView.section ? true : false Text { text: wrapper.ListView.section } } + ListView.onPreviousSectionChanged: validateInitialSections() + ListView.onNextSectionChanged: validateInitialSections() + ListView.onSectionChanged: validateInitialSections() + Component.onCompleted: validateInitialSections() } } ] |