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/global/qconfig-bootstrapped.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/corelib/global/qconfig-bootstrapped.h') diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index ce3b672637..58427364b6 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -86,6 +86,7 @@ #define QT_NO_GEOM_VARIANT #define QT_FEATURE_iconv -1 #define QT_FEATURE_icu -1 +#define QT_FEATURE_jalalicalendar -1 #define QT_FEATURE_journald -1 #define QT_FEATURE_futimens -1 #define QT_FEATURE_futimes -1 -- cgit v1.2.3 From 702664571252e4f5705e39a8258fc81a3fbf37d4 Mon Sep 17 00:00:00 2001 From: Soroush Rabiei Date: Thu, 8 Aug 2019 20:35:13 +0200 Subject: Add support for the Islamic Civil calendar This has its own locale data, extracted from CLDR. This data may potentially be shared with other variants on the Islamic calendar, so is handled by a separate base-class, QHijriCalendar, on which such variants may base their implementations. [ChangeLog][QtCore][QCalendar] Added support for the Islamic Civil calendar, controlled by feature islamiccivilcalendar, with locale data that can be shared with other implementations, controlled by feature hijricalendar. Fixes: QTBUG-56675 Change-Id: Idf32d3da7034baa8ec5e66ef847e59a8a2f31cbd Reviewed-by: Volker Hilsheimer --- src/corelib/global/qconfig-bootstrapped.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/corelib/global/qconfig-bootstrapped.h') diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index 58427364b6..2e58dabf5f 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -84,8 +84,10 @@ #define QT_FEATURE_getauxval (QT_HAS_INCLUDE() ? 1 : -1) #define QT_FEATURE_getentropy -1 #define QT_NO_GEOM_VARIANT +#define QT_FEATURE_hijricalendar -1 #define QT_FEATURE_iconv -1 #define QT_FEATURE_icu -1 +#define QT_FEATURE_islamiccivilcalendar -1 #define QT_FEATURE_jalalicalendar -1 #define QT_FEATURE_journald -1 #define QT_FEATURE_futimens -1 -- cgit v1.2.3