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

Change-Id: I932a1b1606975265e6affd50e161e58737404a0d

2 files changed, 71 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml
index 38af37f7..5775491c 100644
--- a/tests/auto/controls/data/tst_swipeview.qml
+++ b/tests/auto/controls/data/tst_swipeview.qml
@@ -574,4 +574,53 @@ TestCase {
             compare(control.itemAt(i).x, 0)
         }
     }
+
+    Component {
+        id: focusSwipeViewComponent
+
+        SwipeView {
+            id: swipeView
+            anchors.fill: parent
+            focus: true
+
+            property int pressCount
+            property int releaseCount
+            property int rectanglePressCount
+            property int rectangleReleaseCount
+
+            Rectangle {
+                focus: true
+
+                Keys.onPressed: ++swipeView.rectanglePressCount
+                Keys.onReleased: ++swipeView.rectangleReleaseCount
+            }
+
+            Keys.onPressed: ++pressCount
+            Keys.onReleased: ++releaseCount
+        }
+    }
+
+    function test_focus() {
+        if (Qt.styleHints.tabFocusBehavior !== Qt.TabFocusAllControls)
+            skip("This platform only allows tab focus for text controls")
+
+        var control = createTemporaryObject(focusSwipeViewComponent, testCase)
+        verify(control)
+        compare(control.focus, true)
+        compare(control.contentItem.focus, true)
+        compare(control.itemAt(0).focus, true)
+        compare(control.itemAt(0).activeFocus, true)
+
+        keyPress(Qt.Key_A)
+        compare(control.pressCount, 1)
+        compare(control.releaseCount, 0)
+        compare(control.rectanglePressCount, 1)
+        compare(control.rectangleReleaseCount, 0)
+
+        keyRelease(Qt.Key_A)
+        compare(control.pressCount, 1)
+        compare(control.releaseCount, 1)
+        compare(control.rectanglePressCount, 1)
+        compare(control.rectangleReleaseCount, 1)
+    }
 }
diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml
index 70579c70..d98a7cc8 100644
--- a/tests/auto/controls/data/tst_tooltip.qml
+++ b/tests/auto/controls/data/tst_tooltip.qml
@@ -421,4 +421,26 @@ TestCase {
         compare(button2.down, false)
         tryCompare(button2.ToolTip, "visible", false)
     }
+
+    Component {
+        id: wrapComponent
+
+        Item {
+            ToolTip.text: "This is some very very very very very very very very very very very very"
+                + " very very very very very very very very very very very very very very"
+                + " very very very very very very very very very very very very long text"
+        }
+    }
+
+    // QTBUG-62350
+    function test_wrap() {
+        var item = createTemporaryObject(wrapComponent, testCase)
+        verify(item)
+
+        // Avoid "cannot find window to popup in" warning that can occur if it's made visible too early.
+        item.ToolTip.visible = true
+        tryCompare(item.ToolTip.toolTip, "opened", true)
+        compare(item.ToolTip.toolTip.contentItem.wrapMode, Text.Wrap)
+        verify(item.ToolTip.toolTip.contentItem.width < item.ToolTip.toolTip.contentItem.implicitWidth)
+    }
 }