Merge integration refs/builds/qtci/dev/1616505582

This commit is contained in:
Qt CI Bot 2021-03-23 19:38:31 +00:00
commit 2db455aff4

View File

@ -1001,7 +1001,7 @@ const QCalendarBackend *QCalendarBackend::fromEnum(QCalendar::System system)
This enumerated type is used to specify a choice of calendar system. This enumerated type is used to specify a choice of calendar system.
\value Gregorian The default calendar, used internationally. \value Gregorian The default calendar, used internationally.
\value Julian An ancient Roman calendar with too few leap years. \value Julian An ancient Roman calendar.
\value Milankovic A revised Julian calendar used by some Orthodox churches. \value Milankovic A revised Julian calendar used by some Orthodox churches.
\value Jalali The Solar Hijri calendar (also called Persian). \value Jalali The Solar Hijri calendar (also called Persian).
\value IslamicCivil The (tabular) Islamic Civil calendar. \value IslamicCivil The (tabular) Islamic Civil calendar.