aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickcontrol.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-05 13:00:56 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-07 17:07:34 +0000
commit9d8a6e06fc06ed0adfed84385ab6357245a46a37 (patch)
treed654248a910b55b934cfebec6d5aefc3c9b56b0e /src/templates/qquickcontrol.cpp
parentc930f4adf8dd0829c4d3a00d48b70ca988721033 (diff)
Add Control::locale
Change-Id: I6c6647de6d286a92b35bca09a45e82cd3343a623 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickcontrol.cpp')
-rw-r--r--src/templates/qquickcontrol.cpp31
1 files changed, 30 insertions, 1 deletions
diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp
index 0b8c3067..292bc8ec 100644
--- a/src/templates/qquickcontrol.cpp
+++ b/src/templates/qquickcontrol.cpp
@@ -660,6 +660,29 @@ void QQuickControl::setLayoutDirection(Qt::LayoutDirection direction)
}
/*!
+ \qmlproperty Locale Qt.labs.calendar::Control::locale
+
+ This property holds the locale of the control.
+
+ \sa mirrored, {LayoutMirroring}{LayoutMirroring}
+*/
+QLocale QQuickControl::locale() const
+{
+ Q_D(const QQuickControl);
+ return d->locale;
+}
+
+void QQuickControl::setLocale(const QLocale &locale)
+{
+ Q_D(QQuickControl);
+ if (d->locale != locale) {
+ localeChange(locale, d->locale);
+ d->locale = locale;
+ emit localeChanged();
+ }
+}
+
+/*!
\qmlproperty bool Qt.labs.controls::Control::mirrored
\readonly
@@ -668,7 +691,7 @@ void QQuickControl::setLayoutDirection(Qt::LayoutDirection direction)
This property is provided for convenience. A control is considered mirrored
when its visual layout direction is right-to-left.
- \sa effectiveLayoutDirection, {LayoutMirroring}{LayoutMirroring}
+ \sa locale, {LayoutMirroring}{LayoutMirroring}
*/
bool QQuickControl::isMirrored() const
{
@@ -797,4 +820,10 @@ void QQuickControl::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
Q_UNUSED(oldItem);
}
+void QQuickControl::localeChange(const QLocale &newLocale, const QLocale &oldLocale)
+{
+ Q_UNUSED(newLocale);
+ Q_UNUSED(oldLocale);
+}
+
QT_END_NAMESPACE