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/fusion | |
| parent | 885349fdc857c9a78e27419adc970655532a5962 (diff) | |
| parent | 016de465ef06fc80380a4e46e29fca9b12448879 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I65b34cc9ac31ecf2b768ec8e45ac635df7e9cba4
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/ToolTip.qml | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |