From 8957158ce42ffe1823b7ae1304a48bfdca40ec86 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@theqtcompany.com>
Date: Tue, 8 Sep 2015 09:46:23 +0200
Subject: Apply QQuickControl font behavior to QQuickLabel

In 0addfd5d, we missed QQuickLabel.

Change-Id: Icc352f8db04b2b981d386513454650e376f0a955
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
---
 src/controls/qquickcontrol.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/controls/qquickcontrol.cpp')

diff --git a/src/controls/qquickcontrol.cpp b/src/controls/qquickcontrol.cpp
index e91149e3..0e9dc997 100644
--- a/src/controls/qquickcontrol.cpp
+++ b/src/controls/qquickcontrol.cpp
@@ -38,6 +38,8 @@
 #include "qquickcontrol_p_p.h"
 
 #include <QtGui/qguiapplication.h>
+#include "qquicklabel_p.h"
+#include "qquicklabel_p_p.h"
 #include "qquicktextarea_p.h"
 #include "qquicktextarea_p_p.h"
 #include "qquicktextfield_p.h"
@@ -209,6 +211,9 @@ void QQuickControlPrivate::updateFontRecur(QQuickItem *i, const QFont &f)
         if (QQuickControl *qc = qobject_cast<QQuickControl *>(child)) {
             QQuickControlPrivate *qcp = qc->d_func();
             qcp->resolveFont();
+        } else if (QQuickLabel *ql = qobject_cast<QQuickLabel *>(child)) {
+            QQuickLabelPrivate *qlp = QQuickLabelPrivate::get(ql);
+            qlp->resolveFont();
         } else if (QQuickTextArea *qta = qobject_cast<QQuickTextArea *>(child)) {
             QQuickTextAreaPrivate *qtap = QQuickTextAreaPrivate::get(qta);
             qtap->resolveFont();
-- 
cgit v1.2.3