diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-18 14:26:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-18 15:28:37 +0000 |
| commit | 95babf15bda484e7c1764d4db6a6b55c1c47378a (patch) | |
| tree | 783eeb2d26fdd066ee5b975e0f01b283c5347945 /src/quicktemplates2/qquickcontrol_p_p.h | |
| parent | 26eeea3959455fbde884631c554702ef0a8dff75 (diff) | |
QQuickControlPrivate: move font to ExtraData
Change-Id: Idc01a8a23dcddc271bb01d9ab57238a860dc1c84
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickcontrol_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol_p_p.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h index c00443b7..6e934a17 100644 --- a/src/quicktemplates2/qquickcontrol_p_p.h +++ b/src/quicktemplates2/qquickcontrol_p_p.h @@ -51,6 +51,7 @@ #include "qquickcontrol_p.h" #include <QtQuick/private/qquickitem_p.h> +#include <QtQml/private/qlazilyallocated_p.h> #include <qpa/qplatformtheme.h> #ifndef QT_NO_ACCESSIBILITY @@ -108,8 +109,12 @@ public: static void updateLocaleRecur(QQuickItem *item, const QLocale &l); static QLocale calcLocale(const QQuickItem *item); - // TODO: QLazilyAllocated<ExtraData> - QFont font; + struct ExtraData { + ExtraData(); + QFont font; + }; + QLazilyAllocated<ExtraData> extra; + QFont resolvedFont; bool hasTopPadding; bool hasLeftPadding; |