diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-25 22:16:49 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-25 22:17:44 +0300 |
| commit | 93816ce5a52d112b610f8af21ba46d384005a464 (patch) | |
| tree | acc22367aa1619a170a679a94f3f6a31809131c6 /src/imports/controls/ToolTip.qml | |
| parent | fb3e0ab4ef69166bfdadbecb158573b60cadfe18 (diff) | |
| parent | f2e06ce60a8822d844221e77ca0a66f690855452 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: If4e13f09012c80c1043fd0ee82bbddab50b1fad5
Diffstat (limited to 'src/imports/controls/ToolTip.qml')
| -rw-r--r-- | src/imports/controls/ToolTip.qml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml index 55b49644..46f7f577 100644 --- a/src/imports/controls/ToolTip.qml +++ b/src/imports/controls/ToolTip.qml @@ -58,10 +58,12 @@ T.ToolTip { contentItem: Text { text: control.text font: control.font + color: control.palette.toolTipText // TODO: wrapMode: Label.Wrap } background: Rectangle { - border.color: Default.frameDarkColor + border.color: control.palette.dark + color: control.palette.toolTipBase } } |