Native style: remove setting font from QStyle

This is a follow-up on 43eca45b06.

Which font a control should use should follow
normal font propagation. So setting a different
font explicitly in every control is not ideal.
The font is in practice the same for all controls
anyway.

This will also remove a warning that will be
printed if the application assigns a custom
background delegate to a Button.

Fixes: QTBUG-98098
Change-Id: I4f9304b391b4b9e398882fc532cbff5b09f53aff
Reviewed-by: Mitch Curtis <[email protected]>

11 files changed, 1 insertions, 17 deletions

diff --git a/src/quickcontrols/macos/Button.qml b/src/quickcontrols/macos/Button.qml
index 5fa56c2b13..bc13ab4626 100644
--- a/src/quickcontrols/macos/Button.qml
+++ b/src/quickcontrols/macos/Button.qml
@@ -7,6 +7,4 @@ import QtQuick.NativeStyle as NativeStyle
 NativeStyle.DefaultButton {
     id: control
     readonly property Item __focusFrameTarget: control
-
-    font.pixelSize: background.styleFont(control).pixelSize
 }
diff --git a/src/quickcontrols/macos/CheckBox.qml b/src/quickcontrols/macos/CheckBox.qml
index 09756cb594..43c12b6c9f 100644
--- a/src/quickcontrols/macos/CheckBox.qml
+++ b/src/quickcontrols/macos/CheckBox.qml
@@ -8,6 +8,4 @@ NativeStyle.DefaultCheckBox {
     id: control
     readonly property Item __focusFrameTarget: indicator
     readonly property Item __focusFrameStyleItem: indicator
-
-    font.pixelSize: indicator.styleFont(control).pixelSize
 }
diff --git a/src/quickcontrols/macos/ComboBox.qml b/src/quickcontrols/macos/ComboBox.qml
index e530803f8c..c6b2bf862e 100644
--- a/src/quickcontrols/macos/ComboBox.qml
+++ b/src/quickcontrols/macos/ComboBox.qml
@@ -8,7 +8,6 @@ import QtQuick.NativeStyle as NativeStyle
 NativeStyle.DefaultComboBox {
     id: control
     readonly property Item __focusFrameTarget: control
-    font.pixelSize: background.styleFont(control).pixelSize
 
     contentItem: T.TextField {
         implicitWidth: contentWidth
diff --git a/src/quickcontrols/macos/Dial.qml b/src/quickcontrols/macos/Dial.qml
index f0cbf9c691..752afccbd4 100644
--- a/src/quickcontrols/macos/Dial.qml
+++ b/src/quickcontrols/macos/Dial.qml
@@ -6,5 +6,4 @@ import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultDial {
     id: control
-    font.pixelSize: background.styleFont(control).pixelSize
 }
diff --git a/src/quickcontrols/macos/GroupBox.qml b/src/quickcontrols/macos/GroupBox.qml
index c44063d1fb..b3e9a292f6 100644
--- a/src/quickcontrols/macos/GroupBox.qml
+++ b/src/quickcontrols/macos/GroupBox.qml
@@ -6,7 +6,7 @@ import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultGroupBox {
     id: control
-    font.pixelSize: background.styleFont(control).pixelSize
+
     label: Item {
         readonly property point labelPos : control.__nativeBackground
                                   ? background.labelPos
diff --git a/src/quickcontrols/macos/ProgressBar.qml b/src/quickcontrols/macos/ProgressBar.qml
index 66456e029e..ad6be98dc6 100644
--- a/src/quickcontrols/macos/ProgressBar.qml
+++ b/src/quickcontrols/macos/ProgressBar.qml
@@ -6,5 +6,4 @@ import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultProgressBar {
     id: control
-    font.pixelSize: background.styleFont(control).pixelSize
 }
diff --git a/src/quickcontrols/macos/RadioButton.qml b/src/quickcontrols/macos/RadioButton.qml
index 56d1e537a4..f147ca875c 100644
--- a/src/quickcontrols/macos/RadioButton.qml
+++ b/src/quickcontrols/macos/RadioButton.qml
@@ -8,5 +8,4 @@ NativeStyle.DefaultRadioButton {
     id: control
     readonly property Item __focusFrameTarget: indicator
     readonly property Item __focusFrameStyleItem: indicator
-    font.pixelSize: indicator.styleFont(control).pixelSize
 }
diff --git a/src/quickcontrols/macos/ScrollBar.qml b/src/quickcontrols/macos/ScrollBar.qml
index 15235ffc83..d025b0546a 100644
--- a/src/quickcontrols/macos/ScrollBar.qml
+++ b/src/quickcontrols/macos/ScrollBar.qml
@@ -6,7 +6,6 @@ import QtQuick.NativeStyle as NativeStyle
 
 NativeStyle.DefaultScrollBar {
     id: controlRoot
-    font.pixelSize: background.styleFont(controlRoot).pixelSize
 
     contentItem: NativeStyle.ScrollBar {
         control: controlRoot
diff --git a/src/quickcontrols/macos/Slider.qml b/src/quickcontrols/macos/Slider.qml
index 53472556ff..6dd989c13a 100644
--- a/src/quickcontrols/macos/Slider.qml
+++ b/src/quickcontrols/macos/Slider.qml
@@ -8,7 +8,6 @@ NativeStyle.DefaultSlider {
     id: control
     readonly property Item __focusFrameTarget: handle
     readonly property Item __focusFrameStyleItem: handle
-    font.pixelSize: background.styleFont(control).pixelSize
 
     background: NativeStyle.Slider {
         control: control
diff --git a/src/quickcontrols/macos/TextField.qml b/src/quickcontrols/macos/TextField.qml
index 2ef2c683da..041b218a13 100644
--- a/src/quickcontrols/macos/TextField.qml
+++ b/src/quickcontrols/macos/TextField.qml
@@ -7,5 +7,4 @@ import QtQuick.NativeStyle as NativeStyle
 NativeStyle.DefaultTextField {
     id: control
     readonly property Item __focusFrameTarget: control
-    font.pixelSize: background.styleFont(control).pixelSize
 }
diff --git a/src/quicknativestyle/controls/DefaultRadioButton.qml b/src/quicknativestyle/controls/DefaultRadioButton.qml
index 14aff67a7f..0c53416241 100644
--- a/src/quicknativestyle/controls/DefaultRadioButton.qml
+++ b/src/quicknativestyle/controls/DefaultRadioButton.qml
@@ -27,11 +27,6 @@ T.RadioButton {
         contentWidth: contentItem.implicitWidth
         contentHeight: contentItem.implicitHeight
         useNinePatchImage: false
-//        Component.onCompleted: {
-//            var f = indicator.font(control)
-//            control.font.pixelSize = f.pixelSize
-//            print(f)
-//        }
 
         readonly property bool __ignoreNotCustomizable: true
     }