diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:01:04 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:01:04 +0100 |
commit | 016de465ef06fc80380a4e46e29fca9b12448879 (patch) | |
tree | 3308cebb15769284583ec203806e7560326412eb /src/imports/controls/material | |
parent | cb182fb50e49fa88f7bf33f2407447167fd8048f (diff) | |
parent | 2193e9938e98af39a16f5035789c555f2574020b (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I932a1b1606975265e6affd50e161e58737404a0d
Diffstat (limited to 'src/imports/controls/material')
-rw-r--r-- | src/imports/controls/material/SwipeView.qml | 1 | ||||
-rw-r--r-- | src/imports/controls/material/ToolTip.qml | 2 |
2 files changed, 2 insertions, 1 deletions
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 } |