diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
commit | d49d076431d7579ecb33147187fe07eb148112ba (patch) | |
tree | 668370fb9a2eec50000e371125136921ef4518ab /src/corelib/time/qislamiccivilcalendar.cpp | |
parent | b01e69684b9b36492cc43472edeb72058be9f706 (diff) | |
parent | 35cdcddd605d8823b7b57129e8d7279133a3ca89 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic1fd51143f903b7e9086fc19ca960dfd9654ee00
Diffstat (limited to 'src/corelib/time/qislamiccivilcalendar.cpp')
-rw-r--r-- | src/corelib/time/qislamiccivilcalendar.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/corelib/time/qislamiccivilcalendar.cpp b/src/corelib/time/qislamiccivilcalendar.cpp index 27c93f5c00..a6a2afd207 100644 --- a/src/corelib/time/qislamiccivilcalendar.cpp +++ b/src/corelib/time/qislamiccivilcalendar.cpp @@ -47,27 +47,29 @@ QT_BEGIN_NAMESPACE using namespace QRoundingDown; /*! - \since 5.14 + \since 5.14 + \internal - \class QIslamicCivilCalendar - \inmodule QtCore - \brief Implements a commonly-used computed version of the Islamic calendar. + \class QIslamicCivilCalendar + \inmodule QtCore + \brief Implements a commonly-used computed version of the Islamic calendar. - \section1 Civil Islamic Calendar + \section1 Civil Islamic Calendar - QIslamicCivilCalendar implements a tabular version of the Hijri calendar which - is known as the Islamic Civil Calendar. It has the same numbering of years and - months, but the months are determined by arithmetical rules rather than by - observation or astronomical calculations. + QIslamicCivilCalendar implements a tabular version of the Hijri calendar + which is known as the Islamic Civil Calendar. It has the same numbering of + years and months, but the months are determined by arithmetical rules rather + than by observation or astronomical calculations. - \section2 Calendar Organization + \section2 Calendar Organization - The civil calendar follows the usual tabular scheme of odd-numbered months and - the last month of each leap year being 30 days long, the rest being 29 days - long. Its determination of leap years follows a 30-year cycle, in each of - which the years 2, 5, 7, 10, 13, 16, 18, 21, 24, 26 and 29 are leap years. + The civil calendar follows the usual tabular scheme of odd-numbered months + and the last month of each leap year being 30 days long, the rest being 29 + days long. Its determination of leap years follows a 30-year cycle, in each + of which the years 2, 5, 7, 10, 13, 16, 18, 21, 24, 26 and 29 are leap + years. - \sa QJijriCalendar, QCalendar + \sa QHijriCalendar, QCalendar */ QIslamicCivilCalendar::QIslamicCivilCalendar() |