From e71bf9d5c7b14fb3e3b7f970440060c5fd9f9059 Mon Sep 17 00:00:00 2001 From: Soroush Rabiei Date: Thu, 8 Aug 2019 20:27:18 +0200 Subject: 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 Reviewed-by: Volker Hilsheimer --- src/corelib/time/qcalendar.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/corelib/time/qcalendar.cpp') diff --git a/src/corelib/time/qcalendar.cpp b/src/corelib/time/qcalendar.cpp index 4207d26e5c..a315c257de 100644 --- a/src/corelib/time/qcalendar.cpp +++ b/src/corelib/time/qcalendar.cpp @@ -33,6 +33,9 @@ #include "qjuliancalendar_p.h" #include "qmilankoviccalendar_p.h" #endif +#if QT_CONFIG(jalalicalendar) +#include "qjalalicalendar_p.h" +#endif #include "qdatetime.h" #include "qcalendarmath_p.h" @@ -617,6 +620,10 @@ const QCalendarBackend *QCalendarBackend::fromEnum(QCalendar::System system) return new QJulianCalendar; case QCalendar::System::Milankovic: return new QMilankovicCalendar; +#endif +#if QT_CONFIG(jalalicalendar) + case QCalendar::System::Jalali: + return new QJalaliCalendar; #else // When highest-numbered system isn't enabled, ensure we have a case for Last: case QCalendar::System::Last: #endif @@ -659,6 +666,7 @@ const QCalendarBackend *QCalendarBackend::fromEnum(QCalendar::System system) \value Gregorian The default calendar, used internationally. \value Julian An ancient Roman calendar with too few leap years. \value Milankovic A revised Julian calendar used by some Orthodox churches. + \value Jalali The Solar Hijri calendar (also called Persian). \sa QCalendar */ -- cgit v1.2.3