Use TabButtonFont and GroupBoxTitleFont from QPlatformTheme

* QQuickGroupBox: GroupBoxTitleFont
* QQuickTabButton: TabButtonFont

Change-Id: Ib2e58a95c49353536231cc93d28dba075629c59f
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

2 files changed, 11 insertions, 11 deletions

diff --git a/src/imports/controls/universal/qquickuniversaltheme.cpp b/src/imports/controls/universal/qquickuniversaltheme.cpp
index fd470ba6..ada6da32 100644
--- a/src/imports/controls/universal/qquickuniversaltheme.cpp
+++ b/src/imports/controls/universal/qquickuniversaltheme.cpp
@@ -45,11 +45,11 @@ QQuickUniversalTheme::QQuickUniversalTheme(QPlatformTheme *theme)
 {
     systemFont = QFont(QLatin1Literal("Sege UI"));
     systemFont.setPixelSize(15);
-    mdiSubWindowTitleFont = systemFont;
-    mdiSubWindowTitleFont.setWeight(QFont::DemiBold);
-    dockWidgetTitleFont = QFont(QLatin1Literal("Sege UI"));
-    dockWidgetTitleFont.setPixelSize(24);
-    dockWidgetTitleFont.setWeight(QFont::Light);
+    groupBoxTitleFont = systemFont;
+    groupBoxTitleFont.setWeight(QFont::DemiBold);
+    tabButtonFont = QFont(QLatin1Literal("Sege UI"));
+    tabButtonFont.setPixelSize(24);
+    tabButtonFont.setWeight(QFont::Light);
 }
 
 QQuickUniversalTheme::~QQuickUniversalTheme()
@@ -59,10 +59,10 @@ QQuickUniversalTheme::~QQuickUniversalTheme()
 const QFont *QQuickUniversalTheme::font(QPlatformTheme::Font type) const
 {
     switch (type) {
-    case QPlatformTheme::MdiSubWindowTitleFont:
-        return &mdiSubWindowTitleFont;
-    case QPlatformTheme::DockWidgetTitleFont:
-        return &dockWidgetTitleFont;
+    case QPlatformTheme::GroupBoxTitleFont:
+        return &groupBoxTitleFont;
+    case QPlatformTheme::TabButtonFont:
+        return &tabButtonFont;
     default:
         return &systemFont;
     }
diff --git a/src/imports/controls/universal/qquickuniversaltheme_p.h b/src/imports/controls/universal/qquickuniversaltheme_p.h
index c014ead2..20243917 100644
--- a/src/imports/controls/universal/qquickuniversaltheme_p.h
+++ b/src/imports/controls/universal/qquickuniversaltheme_p.h
@@ -65,8 +65,8 @@ public:
 
 private:
     QFont systemFont;
-    QFont mdiSubWindowTitleFont; // QQuickGroupBox
-    QFont dockWidgetTitleFont; // QQuickTabButton
+    QFont groupBoxTitleFont;
+    QFont tabButtonFont;
 };
 
 QT_END_NAMESPACE