diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-23 03:04:56 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-23 03:04:56 +0100 |
| commit | e57f66dc77985eae1023da526ef39d6b3e040255 (patch) | |
| tree | ada69e5f1ed51f97e840a76ee64a8053ab0b2113 /src/imports/controls/material | |
| parent | 885349fdc857c9a78e27419adc970655532a5962 (diff) | |
| parent | 016de465ef06fc80380a4e46e29fca9b12448879 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I65b34cc9ac31ecf2b768ec8e45ac635df7e9cba4
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 } |