summaryrefslogtreecommitdiffstats
path: root/src/corelib/time/qgregoriancalendar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/time/qgregoriancalendar.cpp')
-rw-r--r--src/corelib/time/qgregoriancalendar.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/corelib/time/qgregoriancalendar.cpp b/src/corelib/time/qgregoriancalendar.cpp
index 6d0c3ac925..05db7b39fb 100644
--- a/src/corelib/time/qgregoriancalendar.cpp
+++ b/src/corelib/time/qgregoriancalendar.cpp
@@ -60,18 +60,17 @@ using namespace QRoundingDown;
\sa QRomanCalendar, QJulianCalendar, QCalendar
*/
-QGregorianCalendar::QGregorianCalendar()
- : QRomanCalendar(QStringLiteral("Gregorian"), QCalendar::System::Gregorian)
+QString QGregorianCalendar::name() const
{
- if (calendarId().isValid()) {
- Q_ASSERT(calendarSystem() == QCalendar::System::Gregorian);
- registerAlias(QStringLiteral("gregory"));
- } // else: being ignored in favor of a duplicate created at the same time
+ return QStringLiteral("Gregorian");
}
-QString QGregorianCalendar::name() const
+QStringList QGregorianCalendar::nameList()
{
- return QStringLiteral("Gregorian");
+ return {
+ QStringLiteral("Gregorian"),
+ QStringLiteral("gregory"),
+ };
}
bool QGregorianCalendar::isLeapYear(int year) const