Controls: Make all internal text elements use control.font

Change-Id: I3469277e9dd413a483c82be11fd661a890fab5ba
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

8 files changed, 10 insertions, 1 deletions

diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index 19934824..5c7eaf04 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -58,6 +58,7 @@ T.Button {
         height: control.availableHeight
 
         text: control.text
+        font: control.font
         color: control.Theme.selectedTextColor
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index df53fd09..ca61eff3 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -87,6 +87,7 @@ T.CheckBox {
         height: control.availableHeight
 
         text: control.text
+        font: control.font
         color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor
         elide: Text.ElideRight
         visible: control.text
diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index 63c0d2ca..ac82a263 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -61,6 +61,7 @@ T.GroupBox {
         width: control.availableWidth
 
         text: control.title
+        font: control.font
         color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor
         elide: Text.ElideRight
         horizontalAlignment: Text.AlignLeft
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 5c94382f..6e13503b 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -88,6 +88,7 @@ T.RadioButton {
         height: control.availableHeight
 
         text: control.text
+        font: control.font
         color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor
         elide: Text.ElideRight
         visible: control.text
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index 0eafc2b2..9c05b9de 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -96,6 +96,7 @@ T.Switch {
         height: control.availableHeight
 
         text: control.text
+        font: control.font
         color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor
         elide: Text.ElideRight
         visible: control.text
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml
index b1a88b00..0364385a 100644
--- a/src/imports/controls/TabButton.qml
+++ b/src/imports/controls/TabButton.qml
@@ -48,6 +48,8 @@ T.TabButton {
 
     padding: 6
 
+    font.pointSize: 10
+
     //! [label]
     label: Text {
         x: control.leftPadding
@@ -56,7 +58,7 @@ T.TabButton {
         height: control.availableHeight
 
         text: control.text
-        font.pointSize: 10
+        font: control.font
         elide: Text.ElideRight
         color: !control.enabled ? control.Theme.disabledColor : control.pressed ? control.Theme.accentColor : control.Theme.textColor
         horizontalAlignment: Text.AlignHCenter
diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml
index e533b154..e5dd2805 100644
--- a/src/imports/controls/ToggleButton.qml
+++ b/src/imports/controls/ToggleButton.qml
@@ -95,6 +95,7 @@ T.ToggleButton {
         height: control.availableHeight
 
         text: control.text
+        font: control.font
         color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor
         elide: Text.ElideRight
         visible: control.text
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index f68653b3..13c9d13f 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -56,6 +56,7 @@ T.ToolButton {
         height: control.availableHeight
 
         text: control.text
+        font: control.font
         color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor
         elide: Text.ElideRight
         horizontalAlignment: Text.AlignHCenter