Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I61919fabd4a3a07ed374f2c3c1fae2d589d6e124

1 files changed, 22 insertions, 0 deletions

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)
+    }
 }