diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-31 09:11:56 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-07 08:27:00 +0000 |
| commit | dcf711bdce97778874e6a9bb59b00a0b7d9d84a0 (patch) | |
| tree | c4df7f4e1b9a43b8f8561aea869f343f6fe30b9d | |
| parent | 6b23b6b4507b42a96fb3fb7d2315523f54ce1ac0 (diff) | |
Add missing QQuickMenu::defaultFont()
Change-Id: I74e512074cbc66378ffd71f8040ae8977a3ffeac
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 6 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickmenu_p.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 04305cea..e6f22e2b 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -37,6 +37,7 @@ #include "qquickmenu_p.h" #include "qquickmenu_p_p.h" #include "qquickmenuitem_p.h" +#include "qquickcontrol_p_p.h" #include <QtGui/qevent.h> #include <QtQml/private/qqmlobjectmodel_p.h> @@ -525,6 +526,11 @@ void QQuickMenu::keyReleaseEvent(QKeyEvent *event) item->forceActiveFocus(); } +QFont QQuickMenu::defaultFont() const +{ + return QQuickControlPrivate::themeFont(QPlatformTheme::MenuFont); +} + #if QT_CONFIG(accessibility) QAccessible::Role QQuickMenu::accessibleRole() const { diff --git a/src/quicktemplates2/qquickmenu_p.h b/src/quicktemplates2/qquickmenu_p.h index a899fe51..6d1a4985 100644 --- a/src/quicktemplates2/qquickmenu_p.h +++ b/src/quicktemplates2/qquickmenu_p.h @@ -91,6 +91,8 @@ Q_SIGNALS: void titleChanged(); protected: + QFont defaultFont() const override; + #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif |