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

Change-Id: I932a1b1606975265e6affd50e161e58737404a0d

8 files changed, 8 insertions, 5 deletions

diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml
index ad242e1a..7722d258 100644
--- a/src/imports/controls/SwipeView.qml
+++ b/src/imports/controls/SwipeView.qml
@@ -50,6 +50,7 @@ T.SwipeView {
         model: control.contentModel
         interactive: control.interactive
         currentIndex: control.currentIndex
+        focus: control.focus
 
         spacing: control.spacing
         orientation: control.orientation
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/SwipeView.qml b/src/imports/controls/imagine/SwipeView.qml
index 4998edb7..70d65fef 100644
--- a/src/imports/controls/imagine/SwipeView.qml
+++ b/src/imports/controls/imagine/SwipeView.qml
@@ -61,6 +61,7 @@ T.SwipeView {
         model: control.contentModel
         interactive: control.interactive
         currentIndex: control.currentIndex
+        focus: control.focus
 
         spacing: control.spacing
         orientation: control.orientation
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/SwipeView.qml b/src/imports/controls/material/SwipeView.qml
index 12ea36ae..a84f16c5 100644
--- a/src/imports/controls/material/SwipeView.qml
+++ b/src/imports/controls/material/SwipeView.qml
@@ -50,6 +50,7 @@ T.SwipeView {
         model: control.contentModel
         interactive: control.interactive
         currentIndex: control.currentIndex
+        focus: control.focus
 
         spacing: control.spacing
         orientation: control.orientation
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
     }