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/DelayButton.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/DelayButton.qml')
-rw-r--r-- | src/imports/controls/DelayButton.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/DelayButton.qml index 8f279391..835d6b25 100644 --- a/src/imports/controls/DelayButton.qml +++ b/src/imports/controls/DelayButton.qml @@ -79,7 +79,7 @@ T.DelayButton { text: control.text font: control.font opacity: enabled ? 1 : 0.3 - color: control.visualFocus ? Default.focusColor : (control.down ? Default.textDarkColor : Default.textColor) + color: control.visualFocus ? control.palette.highlight : control.palette.buttonText horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -102,7 +102,7 @@ T.DelayButton { text: control.text font: control.font opacity: enabled ? 1 : 0.3 - color: Default.textLightColor + color: control.palette.brightText horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight |