Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I25813bc151347f69d4dbd9f61729300626be763f

2 files changed, 33 insertions, 3 deletions

diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml
index 18911895..70579c70 100644
--- a/tests/auto/controls/data/tst_tooltip.qml
+++ b/tests/auto/controls/data/tst_tooltip.qml
@@ -205,6 +205,15 @@ TestCase {
         else
             control.visible = true
         compare(control.visible, true)
+        // wait a bit to make sure that it's still visible
+        wait(50)
+        compare(control.visible, true)
+        // re-arm for another 200 ms
+        control.timeout = 200
+        compare(control.visible, true)
+        // ensure that it's still visible after 150 ms (where old timeout < 150 < new timeout)
+        wait(150)
+        compare(control.visible, true)
         tryCompare(control, "visible", false)
     }
 
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index c9cc10d7..5b3ef6e3 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -54,8 +54,8 @@ import QtQuick.Controls 2.12
 
 TestCase {
     id: testCase
-    width: 200
-    height: 200
+    width: 300
+    height: 300
     visible: true
     when: windowShown
     name: "Tumbler"
@@ -513,6 +513,7 @@ TestCase {
         Text {
             text: parent.displacement.toFixed(2)
             anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
         }
 
         property real displacement: Tumbler.displacement
@@ -1236,4 +1237,24 @@ TestCase {
         // 5 - 2 = 3
         compare(tumbler.currentIndex, 3);
     }
+
+    function test_displacementAfterResizing() {
+        createTumbler({
+            width: 200,
+            wrap: false,
+            delegate: displacementDelegate,
+            model: 30,
+            visibleItemCount: 7,
+            currentIndex: 15
+        })
+
+        var delegate = findChild(tumblerView, "delegate15")
+        verify(delegate)
+
+        tryCompare(delegate, "displacement", 0)
+
+        // Resizing the Tumbler shouldn't affect the displacement.
+        tumbler.height *= 1.4
+        tryCompare(delegate, "displacement", 0)
+    }
 }