Make ToolTips wrap

Otherwise the text will go outside the window.

Change-Id: I3d50a195b1ee6c9b5d49952ef6c49d17c61372fa
Fixes: QTBUG-62350
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

6 files changed, 27 insertions, 5 deletions

diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml
index ae903e4c..e0389903 100644
--- a/src/imports/controls/ToolTip.qml
+++ b/src/imports/controls/ToolTip.qml
@@ -58,8 +58,8 @@ T.ToolTip {
     contentItem: Text {
         text: control.text
         font: control.font
+        wrapMode: Text.Wrap
         color: control.palette.toolTipText
-        // TODO: wrapMode: Label.Wrap
     }
 
     background: Rectangle {
diff --git a/src/imports/controls/fusion/ToolTip.qml b/src/imports/controls/fusion/ToolTip.qml
index 73f561e4..b505e2c9 100644
--- a/src/imports/controls/fusion/ToolTip.qml
+++ b/src/imports/controls/fusion/ToolTip.qml
@@ -60,8 +60,8 @@ T.ToolTip {
     contentItem: Text {
         text: control.text
         font: control.font
+        wrapMode: Text.Wrap
         color: control.palette.toolTipText
-        // TODO: wrapMode: Label.Wrap
     }
 
     background: Rectangle {
diff --git a/src/imports/controls/imagine/ToolTip.qml b/src/imports/controls/imagine/ToolTip.qml
index 250452d8..21d75ebc 100644
--- a/src/imports/controls/imagine/ToolTip.qml
+++ b/src/imports/controls/imagine/ToolTip.qml
@@ -70,7 +70,7 @@ T.ToolTip {
     contentItem: Text {
         text: control.text
         font: control.font
-        // TODO: wrapMode: Label.Wrap
+        wrapMode: Text.Wrap
         color: control.palette.toolTipText
     }
 
diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml
index fb705367..83afe4b1 100644
--- a/src/imports/controls/material/ToolTip.qml
+++ b/src/imports/controls/material/ToolTip.qml
@@ -70,7 +70,7 @@ T.ToolTip {
     contentItem: Text {
         text: control.text
         font: control.font
-        // TODO: wrapMode: Label.Wrap
+        wrapMode: Text.Wrap
         color: control.Material.foreground
     }
 
diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml
index cf7325b6..431cdf7c 100644
--- a/src/imports/controls/universal/ToolTip.qml
+++ b/src/imports/controls/universal/ToolTip.qml
@@ -59,7 +59,7 @@ T.ToolTip {
     contentItem: Text {
         text: control.text
         font: control.font
-        // TODO: wrapMode: Label.Wrap
+        wrapMode: Text.Wrap
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
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)
+    }
 }