aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickcontrol_p_p.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-12-17 10:46:42 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-21 16:47:55 +0000
commit8099ecb2a73832b930d217e7a957f190d49e6eb1 (patch)
treea85be2bc15760472e298788de23c14c930ee53ac /src/templates/qquickcontrol_p_p.h
parentc34e39cd1fd078510467536a9562e365cdae4d8f (diff)
Control: implement locale inheritance
Change-Id: I2f16141b53dd44e471050ef6901ddc480c77895f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickcontrol_p_p.h')
-rw-r--r--src/templates/qquickcontrol_p_p.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/templates/qquickcontrol_p_p.h b/src/templates/qquickcontrol_p_p.h
index fff36bc0..21f6c1b1 100644
--- a/src/templates/qquickcontrol_p_p.h
+++ b/src/templates/qquickcontrol_p_p.h
@@ -102,12 +102,17 @@ public:
void resolveFont();
static QFont naturalControlFont(const QQuickItem *);
static QFont themeFont(QPlatformTheme::Font type);
+ void updateLocale(const QLocale &l, bool e);
+ static void updateLocaleRecur(QQuickItem *item, const QLocale &l);
+
+ QLocale calcLocale() const;
QFont font;
bool hasTopPadding;
bool hasLeftPadding;
bool hasRightPadding;
bool hasBottomPadding;
+ bool hasLocale;
qreal padding;
qreal topPadding;
qreal leftPadding;