diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-11-21 11:32:01 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-11-21 11:32:01 +0100 |
commit | 546539562f2aff985e78f3c2426cb711a865ad65 (patch) | |
tree | a4fac78b563b8b1d4bd40ee13bf5db3f4afdade8 /src/imports/controls/material/ToolTip.qml | |
parent | 9c054dd5d2925adbb1ac9745013011a16f78023f (diff) | |
parent | 49b1e3ff2ac20d8aa8b3889fc76ab4e6907817fd (diff) |
Merge 5.14 into 5.14.0
Change-Id: I579dc498300e06d747bdc4dba12f7ecd617b6608
Diffstat (limited to 'src/imports/controls/material/ToolTip.qml')
-rw-r--r-- | src/imports/controls/material/ToolTip.qml | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |