Merge remote-tracking branch 'origin/5.9' into 5.10

Conflicts:
	src/imports/controls/Tumbler.qml
	src/quicktemplates2/qquicktumbler.cpp
	src/quicktemplates2/qquicktumbler_p.h
	src/quicktemplates2/qquicktumbler_p_p.h

Change-Id: I8d50991183fe3c5b50a49e00f01bcd3049f5346c

1 files changed, 18 insertions, 3 deletions

diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index fbcb2c40..03908566 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -289,11 +289,10 @@ TestCase {
         compare(tumblerView.currentIndex, data.currentIndex);
         compare(tumblerView.currentItem.text, data.currentIndex.toString());
 
-        var fuzz = 1;
         if (data.wrap) {
-            fuzzyCompare(tumblerView.offset, data.currentIndex > 0 ? tumblerView.count - data.currentIndex : 0, fuzz);
+            tryCompare(tumblerView, "offset", data.currentIndex > 0 ? tumblerView.count - data.currentIndex : 0);
         } else {
-            fuzzyCompare(tumblerView.contentY, tumblerDelegateHeight * data.currentIndex - tumblerView.preferredHighlightBegin, fuzz);
+            tryCompare(tumblerView, "contentY", tumblerDelegateHeight * data.currentIndex - tumblerView.preferredHighlightBegin);
         }
     }
 
@@ -682,6 +681,17 @@ TestCase {
         compare(tumbler.currentIndex, 3);
     }
 
+    function findFirstDelegateWithText(view, text) {
+        var delegate = null;
+        var contentItem = view.hasOwnProperty("contentItem") ? view.contentItem : view;
+        for (var i = 0; i < contentItem.children.length && !delegate; ++i) {
+            var child = contentItem.children[i];
+            if (child.hasOwnProperty("text") && child.text === text)
+                delegate = child;
+        }
+        return delegate;
+    }
+
     function test_customContentItemAfterConstruction_data() {
         return [
             { tag: "ListView", componentPath: "TumblerListView.qml" },
@@ -707,6 +717,11 @@ TestCase {
         tumblerView = findView(tumbler);
         compare(tumblerView.currentIndex, 2);
 
+        var delegate = findFirstDelegateWithText(tumblerView, "Custom2");
+        verify(delegate);
+        compare(delegate.height, defaultImplicitDelegateHeight);
+        tryCompare(delegate.Tumbler, "displacement", 0);
+
         tumblerView.incrementCurrentIndex();
         compare(tumblerView.currentIndex, 3);
         compare(tumbler.currentIndex, 3);