8 files changed, 18 insertions, 18 deletions
diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp
index e0c1ad5d..754ce510 100644
--- a/src/templates/qquickapplicationwindow.cpp
+++ b/src/templates/qquickapplicationwindow.cpp
@@ -116,7 +116,7 @@ public:
     void itemImplicitWidthChanged(QQuickItem *item) override;
     void itemImplicitHeightChanged(QQuickItem *item) override;
 
-    void updateFont(const QFont &);
+    void updateFont(const QFont &f);
     inline void setFont_helper(const QFont &f) {
         if (font.resolve() == f.resolve() && font == f)
             return;
@@ -465,13 +465,13 @@ QFont QQuickApplicationWindow::font() const
     return d->font;
 }
 
-void QQuickApplicationWindow::setFont(const QFont &f)
+void QQuickApplicationWindow::setFont(const QFont &font)
 {
     Q_D(QQuickApplicationWindow);
-    if (d->font.resolve() == f.resolve() && d->font == f)
+    if (d->font.resolve() == font.resolve() && d->font == font)
         return;
 
-    QFont resolvedFont = f.resolve(QQuickControlPrivate::themeFont(QPlatformTheme::SystemFont));
+    QFont resolvedFont = font.resolve(QQuickControlPrivate::themeFont(QPlatformTheme::SystemFont));
     d->setFont_helper(resolvedFont);
 }
 
diff --git a/src/templates/qquickapplicationwindow_p.h b/src/templates/qquickapplicationwindow_p.h
index 87105040..9a6963e2 100644
--- a/src/templates/qquickapplicationwindow_p.h
+++ b/src/templates/qquickapplicationwindow_p.h
@@ -70,7 +70,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImp
     Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL)
     Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL)
     Q_PROPERTY(QQuickOverlay *overlay READ overlay CONSTANT FINAL)
-    Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged)
+    Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL)
     Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL)
     Q_CLASSINFO("DefaultProperty", "data")
 
@@ -95,7 +95,7 @@ public:
     QQuickOverlay *overlay() const;
 
     QFont font() const;
-    void setFont(const QFont &);
+    void setFont(const QFont &font);
     void resetFont();
 
     QLocale locale() const;
diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp
index 866d99a6..08c6d893 100644
--- a/src/templates/qquickcontrol.cpp
+++ b/src/templates/qquickcontrol.cpp
@@ -219,9 +219,9 @@ void QQuickControl::accessibilityActiveChanged(bool active)
     Returns the font that the control w inherits from its ancestors and
     QGuiApplication::font.
 */
-QFont QQuickControlPrivate::naturalControlFont(const QQuickItem *q)
+QFont QQuickControlPrivate::parentFont(const QQuickItem *item)
 {
-    QQuickItem *p = q->parentItem();
+    QQuickItem *p = item->parentItem();
     while (p) {
         if (QQuickControl *control = qobject_cast<QQuickControl *>(p))
             return control->font();
@@ -235,7 +235,7 @@ QFont QQuickControlPrivate::naturalControlFont(const QQuickItem *q)
         p = p->parentItem();
     }
 
-    if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(q->window()))
+    if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(item->window()))
         return window->font();
 
     return themeFont(QPlatformTheme::SystemFont);
@@ -266,7 +266,7 @@ QFont QQuickControlPrivate::themeFont(QPlatformTheme::Font type)
 void QQuickControlPrivate::resolveFont()
 {
     Q_Q(QQuickControl);
-    inheritFont(naturalControlFont(q));
+    inheritFont(parentFont(q));
 }
 
 void QQuickControlPrivate::inheritFont(const QFont &f)
diff --git a/src/templates/qquickcontrol_p.h b/src/templates/qquickcontrol_p.h
index dcf710f3..22d4d402 100644
--- a/src/templates/qquickcontrol_p.h
+++ b/src/templates/qquickcontrol_p.h
@@ -59,7 +59,7 @@ class QQuickControlPrivate;
 class Q_LABSTEMPLATES_EXPORT QQuickControl : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged)
+    Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL)
     Q_PROPERTY(qreal availableWidth READ availableWidth NOTIFY availableWidthChanged FINAL)
     Q_PROPERTY(qreal availableHeight READ availableHeight NOTIFY availableHeightChanged FINAL)
     Q_PROPERTY(qreal padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL)
@@ -82,7 +82,7 @@ public:
     explicit QQuickControl(QQuickItem *parent = nullptr);
 
     QFont font() const;
-    void setFont(const QFont &);
+    void setFont(const QFont &font);
     void resetFont();
 
     qreal availableWidth() const;
diff --git a/src/templates/qquickcontrol_p_p.h b/src/templates/qquickcontrol_p_p.h
index 3d4f7d43..c0b0ee81 100644
--- a/src/templates/qquickcontrol_p_p.h
+++ b/src/templates/qquickcontrol_p_p.h
@@ -92,8 +92,8 @@ public:
     QAccessible::Role accessibleRole() const override;
 #endif
 
-    void updateFont(const QFont &);
-    static void updateFontRecur(QQuickItem *item, const QFont &);
+    void updateFont(const QFont &f);
+    static void updateFontRecur(QQuickItem *item, const QFont &f);
     inline void setFont_helper(const QFont &f) {
         if (resolvedFont.resolve() == f.resolve() && resolvedFont == f)
             return;
@@ -101,7 +101,7 @@ public:
     }
     void resolveFont();
     void inheritFont(const QFont &f);
-    static QFont naturalControlFont(const QQuickItem *);
+    static QFont parentFont(const QQuickItem *item);
     static QFont themeFont(QPlatformTheme::Font type);
 
     void updateLocale(const QLocale &l, bool e);
diff --git a/src/templates/qquicklabel.cpp b/src/templates/qquicklabel.cpp
index 0aade822..416f8001 100644
--- a/src/templates/qquicklabel.cpp
+++ b/src/templates/qquicklabel.cpp
@@ -118,7 +118,7 @@ QQuickLabelPrivate::~QQuickLabelPrivate()
 void QQuickLabelPrivate::resolveFont()
 {
     Q_Q(QQuickLabel);
-    inheritFont(QQuickControlPrivate::naturalControlFont(q));
+    inheritFont(QQuickControlPrivate::parentFont(q));
 }
 
 void QQuickLabelPrivate::inheritFont(const QFont &f)
diff --git a/src/templates/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp
index aed26e46..6eaae4ea 100644
--- a/src/templates/qquicktextarea.cpp
+++ b/src/templates/qquicktextarea.cpp
@@ -161,7 +161,7 @@ QQuickTextArea::~QQuickTextArea()
 void QQuickTextAreaPrivate::resolveFont()
 {
     Q_Q(QQuickTextArea);
-    inheritFont(QQuickControlPrivate::naturalControlFont(q));
+    inheritFont(QQuickControlPrivate::parentFont(q));
 }
 
 void QQuickTextAreaPrivate::inheritFont(const QFont &f)
diff --git a/src/templates/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp
index dbb91d0c..43328e29 100644
--- a/src/templates/qquicktextfield.cpp
+++ b/src/templates/qquicktextfield.cpp
@@ -175,7 +175,7 @@ QQuickTextField::~QQuickTextField()
 void QQuickTextFieldPrivate::resolveFont()
 {
     Q_Q(QQuickTextField);
-    inheritFont(QQuickControlPrivate::naturalControlFont(q));
+    inheritFont(QQuickControlPrivate::parentFont(q));
 }
 
 void QQuickTextFieldPrivate::inheritFont(const QFont &f)