diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-03-02 09:10:34 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-02 16:21:30 +0000 |
| commit | e7c513012f334affb8f33e6f18d9ef59064e5901 (patch) | |
| tree | 7f6c09b30bd52fd0cc6c47d083b2b6dbf6dba0d6 /src/quicktemplates2/qquickmenuitem.cpp | |
| parent | c29b9320db7877ff7960fecca441b8de59457537 (diff) | |
qquickmenuitem.cpp: move defaultFont()
It was placed after the constructor. Move it after properties to keep
the same order as declared in the header.
Change-Id: I91584f80a5a7eee139393f635b7465f5795c2332
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenuitem.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickmenuitem.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp index e15640fb..f51922fe 100644 --- a/src/quicktemplates2/qquickmenuitem.cpp +++ b/src/quicktemplates2/qquickmenuitem.cpp @@ -110,11 +110,6 @@ QQuickMenuItem::QQuickMenuItem(QQuickItem *parent) connect(this, &QQuickAbstractButton::clicked, this, &QQuickMenuItem::triggered); } -QFont QQuickMenuItem::defaultFont() const -{ - return QQuickControlPrivate::themeFont(QPlatformTheme::MenuItemFont); -} - /*! \qmlproperty bool QtQuick.Controls::MenuItem::highlighted @@ -141,6 +136,11 @@ void QQuickMenuItem::setHighlighted(bool highlighted) emit highlightedChanged(); } +QFont QQuickMenuItem::defaultFont() const +{ + return QQuickControlPrivate::themeFont(QPlatformTheme::MenuItemFont); +} + #if QT_CONFIG(accessibility) QAccessible::Role QQuickMenuItem::accessibleRole() const { |