diff options
| author | Soroush Rabiei <soroush@ametisco.ir> | 2019-08-08 20:27:18 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-08-21 22:18:48 +0200 |
| commit | e71bf9d5c7b14fb3e3b7f970440060c5fd9f9059 (patch) | |
| tree | ba93b88c43d9f7d015ee3dee5d0a35e9e6870313 /src/corelib/time/qcalendar.h | |
| parent | 3e771a8b09cd5e46c4aff0e8bd28b946dd4e3fa5 (diff) | |
Add support for the Jalali (Solar Hijri or Persian) calendar
This has its own locale data, extracted from CLDR.
[ChangeLog][QtCore][QCalendar] Added support for the Jalali (Persian
or Solar Hijri) calendar, controlled by feature jalalicalendar.
Fixes: QTBUG-58404
Change-Id: Id5c56a10db05a4fd612aafc01615273db81ec743
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/time/qcalendar.h')
| -rw-r--r-- | src/corelib/time/qcalendar.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/time/qcalendar.h b/src/corelib/time/qcalendar.h index 25740fa3d3..595b7397cd 100644 --- a/src/corelib/time/qcalendar.h +++ b/src/corelib/time/qcalendar.h @@ -110,7 +110,13 @@ public: Julian = 8, Milankovic = 9, #endif // These are Roman-based, so share Gregorian's CLDR data - Last = 9, // Highest number of any above + + // Feature-controlled calendars: +#if QT_CONFIG(jalalicalendar) // type="persian" + Jalali = 10, +#endif + + Last = 10, // Highest number of any above User = -1 }; // New entries must be added to the \enum doc in qcalendar.cpp and |