From 3809315b2658327504f8518db0c0b49a015a71a5 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@theqtcompany.com>
Date: Wed, 9 Dec 2015 12:22:11 +0100
Subject: Use TabButtonFont and GroupBoxTitleFont from QPlatformTheme

* QQuickGroupBox: GroupBoxTitleFont
* QQuickTabButton: TabButtonFont

Change-Id: Ib2e58a95c49353536231cc93d28dba075629c59f
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
---
 src/imports/controls/material/qquickmaterialtheme.cpp  |  6 +++---
 src/imports/controls/material/qquickmaterialtheme_p.h  |  2 +-
 .../controls/universal/qquickuniversaltheme.cpp        | 18 +++++++++---------
 .../controls/universal/qquickuniversaltheme_p.h        |  4 ++--
 src/templates/qquickgroupbox.cpp                       |  2 +-
 src/templates/qquicktabbutton.cpp                      |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp
index ee98c35c..f64205bb 100644
--- a/src/imports/controls/material/qquickmaterialtheme.cpp
+++ b/src/imports/controls/material/qquickmaterialtheme.cpp
@@ -44,7 +44,7 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme)
     : QQuickProxyTheme(theme)
 {
     systemFont = QFont(QLatin1Literal("Roboto"));
-    dockWidgetTitleFont = QFont(QLatin1Literal("Roboto"), 10);
+    tabButtonFont = QFont(QLatin1Literal("Roboto"), 10);
 }
 
 QQuickMaterialTheme::~QQuickMaterialTheme()
@@ -54,8 +54,8 @@ QQuickMaterialTheme::~QQuickMaterialTheme()
 const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const
 {
     switch (type) {
-    case QPlatformTheme::DockWidgetTitleFont:
-        return &dockWidgetTitleFont;
+    case QPlatformTheme::TabButtonFont:
+        return &tabButtonFont;
     default:
         return &systemFont;
     }
diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h
index e3d6ce9b..28fb30e9 100644
--- a/src/imports/controls/material/qquickmaterialtheme_p.h
+++ b/src/imports/controls/material/qquickmaterialtheme_p.h
@@ -65,7 +65,7 @@ public:
 
 private:
     QFont systemFont;
-    QFont dockWidgetTitleFont; // QQuickTabButton
+    QFont tabButtonFont;
 };
 
 QT_END_NAMESPACE
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
diff --git a/src/templates/qquickgroupbox.cpp b/src/templates/qquickgroupbox.cpp
index ef9e3da8..ef8789a5 100644
--- a/src/templates/qquickgroupbox.cpp
+++ b/src/templates/qquickgroupbox.cpp
@@ -139,7 +139,7 @@ void QQuickGroupBox::setLabel(QQuickItem *label)
 
 QFont QQuickGroupBox::defaultFont() const
 {
-    return QQuickControlPrivate::themeFont(QPlatformTheme::MdiSubWindowTitleFont); // tmp
+    return QQuickControlPrivate::themeFont(QPlatformTheme::GroupBoxTitleFont);
 }
 
 QT_END_NAMESPACE
diff --git a/src/templates/qquicktabbutton.cpp b/src/templates/qquicktabbutton.cpp
index 07dc533c..00d4d8b4 100644
--- a/src/templates/qquicktabbutton.cpp
+++ b/src/templates/qquicktabbutton.cpp
@@ -67,7 +67,7 @@ QQuickTabButton::QQuickTabButton(QQuickItem *parent) :
 
 QFont QQuickTabButton::defaultFont() const
 {
-    return QQuickControlPrivate::themeFont(QPlatformTheme::DockWidgetTitleFont); // tmp
+    return QQuickControlPrivate::themeFont(QPlatformTheme::TabButtonFont);
 }
 
 #ifndef QT_NO_ACCESSIBILITY
-- 
cgit v1.2.3