2 files changed, 39 insertions, 1 deletions
diff --git a/tests/auto/controls/data/TumblerDatePicker.qml b/tests/auto/controls/data/TumblerDatePicker.qml
index ac04284a..72e57bed 100644
--- a/tests/auto/controls/data/TumblerDatePicker.qml
+++ b/tests/auto/controls/data/TumblerDatePicker.qml
@@ -87,6 +87,7 @@ Row {
         id: yearTumbler
         objectName: "yearTumbler"
         model: ListModel {
+            objectName: "yearTumblerListModel"
             Component.onCompleted: {
                 for (var i = 2000; i < 2100; ++i) {
                     append({value: i.toString()});
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index 00d13e23..aaf888c2 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -389,7 +389,7 @@ TestCase {
         compare(tumbler.monthTumbler.currentIndex, 0);
         compare(tumbler.monthTumbler.count, 12);
         compare(tumbler.yearTumbler.currentIndex, 0);
-        compare(tumbler.yearTumbler.count, 100);
+        tryCompare(tumbler.yearTumbler, "count", 100);
 
         verify(findView(tumbler.dayTumbler).children.length >= tumbler.dayTumbler.visibleItemCount);
         verify(findView(tumbler.monthTumbler).children.length >= tumbler.monthTumbler.visibleItemCount);
@@ -1057,4 +1057,41 @@ TestCase {
         compare(tumbler.moving, true)
         tryCompare(tumbler, "moving", false)
     }
+
+    Component {
+        id: qtbug61374Component
+
+        Row {
+            property alias tumbler: tumbler
+            property alias label: label
+
+            Component.onCompleted: {
+                tumbler.currentIndex = 2
+            }
+
+            Tumbler {
+                id: tumbler
+                model: 5
+                // ...
+            }
+
+            Label {
+                id: label
+                text: tumbler.currentItem.text
+            }
+        }
+    }
+
+    function test_qtbug61374() {
+        var row = createTemporaryObject(qtbug61374Component, testCase);
+        verify(row);
+
+        var tumbler = row.tumbler;
+        tryCompare(tumbler, "currentIndex", 2);
+
+        tumblerView = findView(tumbler);
+
+        var label = row.label;
+        compare(label.text, "2");
+    }
 }