Commit 006c4f5f authored by Zren (Chris Holland)'s avatar Zren (Chris Holland)

[Digital Clock] Fix 24h tri-state button broken in port to QQC2

In 12h system locales (eg: en_US), checked=1 is cast as
Qt::PartiallyChecked=1 which defaults to the system locale (12h).
Since it's no longer a tri-state button, the user can't select
Qt::Checked=2 which forces the 24h state.

BUG: 404292

FIXED-IN: 5.15.1
parent aeb6545e
......@@ -45,7 +45,7 @@ QtLayouts.ColumnLayout {
property alias cfg_showDate: showDate.checked
property string cfg_dateFormat: "shortDate"
property alias cfg_customDateFormat: customDateFormat.text
property alias cfg_use24hFormat: use24hFormat.checked
property alias cfg_use24hFormat: use24hFormat.checkState
onCfg_fontFamilyChanged: {
// HACK by the time we populate our model and/or the ComboBox is finished the value is still undefined
......@@ -91,6 +91,7 @@ QtLayouts.ColumnLayout {
QtControls.CheckBox {
id: use24hFormat
text: i18nc("Checkbox label; means 24h clock format, without am/pm", "Use 24-hour Clock")
tristate: true
QtControls.CheckBox {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment