diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-12 18:11:29 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-06-12 18:11:29 +0000 |
commit | 23a80af1b5d31621bf1d342706c9541dd5273b86 (patch) | |
tree | 09e66f5945ce9bd1cfa1a38741d247094e491765 /src/quicktemplates2/qquickmenu.cpp | |
parent | e81332e461ae7662b11fc1da04bb052e354514a3 (diff) | |
parent | 38be5b605a844693bb93d24fab8c721bec273003 (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/quicktemplates2/qquickmenu.cpp')
-rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 781bd6da..fa6b88ef 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -806,6 +806,11 @@ void QQuickMenu::keyReleaseEvent(QKeyEvent *event) item->forceActiveFocus(); } +QFont QQuickMenu::defaultFont() const +{ + return QQuickControlPrivate::themeFont(QPlatformTheme::MenuFont); +} + QPalette QQuickMenu::defaultPalette() const { return QQuickControlPrivate::themePalette(QPlatformTheme::MenuPalette); |