diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-03 13:32:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-03 17:18:33 +0000 |
| commit | 7dd751c0ad4d8a4c1f4827cc9ae587f69d48807e (patch) | |
| tree | eac2224e1e5e1625c8e4253571b45eb460a7c473 /src/imports/controls | |
| parent | e3adcf27372e571f9ca032c736e2bb40a5346d49 (diff) | |
Material Button: fix font inheritance
Change-Id: I30235a5a43ec6cfd8107bf0f6433e22c20df4a7d
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/material/Button.qml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 6d2ab499..582bc472 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -60,6 +60,7 @@ T.Button { height: control.availableHeight text: control.text + font: control.font color: control.highlighted ? control.Material.primaryHighlightedTextColor : control.Material.primaryTextColor horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter |