Use ToolTip font from theme

Change-Id: I9a95bcd02a48528bc3e3315c7aa730a2d43bb002
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

4 files changed, 15 insertions, 0 deletions

diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp
index 1f3bba49..379a30fc 100644
--- a/src/imports/controls/material/qquickmaterialtheme.cpp
+++ b/src/imports/controls/material/qquickmaterialtheme.cpp
@@ -52,6 +52,7 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme)
         const QString family = font.family();
         systemFont.setFamily(family);
         buttonFont.setFamily(family);
+        toolTipFont.setFamily(family);
         itemViewFont.setFamily(family);
         listViewFont.setFamily(family);
         menuItemFont.setFamily(family);
@@ -64,6 +65,9 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme)
     buttonFont.setCapitalization(QFont::AllUppercase);
     buttonFont.setWeight(QFont::Medium);
 
+    toolTipFont.setPixelSize(14);
+    toolTipFont.setWeight(QFont::Medium);
+
     itemViewFont.setPixelSize(14);
     itemViewFont.setWeight(QFont::Medium);
 
@@ -81,6 +85,8 @@ const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const
     case QPlatformTheme::PushButtonFont:
     case QPlatformTheme::ToolButtonFont:
         return &buttonFont;
+    case QPlatformTheme::TipLabelFont:
+        return &toolTipFont;
     case QPlatformTheme::ItemViewFont:
         return &itemViewFont;
     case QPlatformTheme::ListViewFont:
diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h
index 8739a756..9bd62fc1 100644
--- a/src/imports/controls/material/qquickmaterialtheme_p.h
+++ b/src/imports/controls/material/qquickmaterialtheme_p.h
@@ -63,6 +63,7 @@ public:
 private:
     QFont systemFont;
     QFont buttonFont;
+    QFont toolTipFont;
     QFont itemViewFont;
     QFont listViewFont;
     QFont menuItemFont;
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index 0992c2e4..92ca7b80 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -36,6 +36,7 @@
 
 #include "qquicktooltip_p.h"
 #include "qquickpopup_p_p.h"
+#include "qquickcontrol_p_p.h"
 
 #include <QtCore/qbasictimer.h>
 #include <QtQml/qqmlinfo.h>
@@ -263,6 +264,11 @@ void QQuickToolTip::close()
     QQuickPopup::close();
 }
 
+QFont QQuickToolTip::defaultFont() const
+{
+    return QQuickControlPrivate::themeFont(QPlatformTheme::TipLabelFont);
+}
+
 void QQuickToolTip::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
 {
     Q_D(QQuickToolTip);
diff --git a/src/quicktemplates2/qquicktooltip_p.h b/src/quicktemplates2/qquicktooltip_p.h
index e6fa369c..47076d4f 100644
--- a/src/quicktemplates2/qquicktooltip_p.h
+++ b/src/quicktemplates2/qquicktooltip_p.h
@@ -87,6 +87,8 @@ Q_SIGNALS:
     void timeoutChanged();
 
 protected:
+    QFont defaultFont() const override;
+
     void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) override;
     void timerEvent(QTimerEvent *event) override;