diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-17 10:46:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-21 16:47:55 +0000 |
| commit | 8099ecb2a73832b930d217e7a957f190d49e6eb1 (patch) | |
| tree | a85be2bc15760472e298788de23c14c930ee53ac /src/templates/qquickcontrol_p.h | |
| parent | c34e39cd1fd078510467536a9562e365cdae4d8f (diff) | |
Control: implement locale inheritance
Change-Id: I2f16141b53dd44e471050ef6901ddc480c77895f
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickcontrol_p.h')
| -rw-r--r-- | src/templates/qquickcontrol_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/templates/qquickcontrol_p.h b/src/templates/qquickcontrol_p.h index ea1180b1..8d4055e5 100644 --- a/src/templates/qquickcontrol_p.h +++ b/src/templates/qquickcontrol_p.h @@ -68,7 +68,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickControl : public QQuickItem Q_PROPERTY(qreal rightPadding READ rightPadding WRITE setRightPadding RESET resetRightPadding NOTIFY rightPaddingChanged FINAL) Q_PROPERTY(qreal bottomPadding READ bottomPadding WRITE setBottomPadding RESET resetBottomPadding NOTIFY bottomPaddingChanged FINAL) Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL) - Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL) + Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL) Q_PROPERTY(bool mirrored READ isMirrored NOTIFY mirroredChanged FINAL) Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL) Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) @@ -110,6 +110,7 @@ public: QLocale locale() const; void setLocale(const QLocale &locale); + void resetLocale(); bool isMirrored() const; |