diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2017-05-29 14:57:07 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-06-16 12:15:29 +0000 |
commit | d13e4db9d74aefc0bd08ca946b789155a11361fb (patch) | |
tree | bd99878b498975662042c51a0ee7b9fdaf9245c1 /src/extras/Styles/Flat | |
parent | 9f085b889524a80d4064d6ac01dbdc817bb31060 (diff) | |
download | qtquickcontrols-d13e4db9d74aefc0bd08ca946b789155a11361fb.tar.gz |
Calendar: make locale property public
This is useful to set a locale on a specific calendar, as opposed to
using the application-wide default.
plugins.qmltypes was also updated.
[ChangeLog][Calendar] Added locale property, which affects which day is
shown as the first day of the week, as well as date and day name
localization.
Task-number: QTBUG-60217
Change-Id: I113298a3f3b6dd407d26f3f55ed6973e73ab6a4c
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/extras/Styles/Flat')
-rw-r--r-- | src/extras/Styles/Flat/CalendarStyle.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/extras/Styles/Flat/CalendarStyle.qml b/src/extras/Styles/Flat/CalendarStyle.qml index 2598ce78..ece0548d 100644 --- a/src/extras/Styles/Flat/CalendarStyle.qml +++ b/src/extras/Styles/Flat/CalendarStyle.qml @@ -190,7 +190,7 @@ Base.CalendarStyle { Label { text: localeDayName.length == 0 || localeDayName.length > 1 - ? control.__locale.dayName(styleData.dayOfWeek, Locale.ShortFormat)[0] + ? control.locale.dayName(styleData.dayOfWeek, Locale.ShortFormat)[0] : localeDayName color: !control.enabled ? FlatStyle.disabledColor : FlatStyle.styleColor opacity: !control.enabled ? FlatStyle.disabledOpacity : 1 @@ -202,7 +202,7 @@ Base.CalendarStyle { font.pixelSize: control.height * __headerFontRatio renderType: FlatStyle.__renderType - property string localeDayName: control.__locale.dayName(styleData.dayOfWeek, Locale.NarrowFormat) + property string localeDayName: control.locale.dayName(styleData.dayOfWeek, Locale.NarrowFormat) } } } |