diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
| commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
| tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /src/corelib/time/qcalendarbackend_p.h | |
| parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
| parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'src/corelib/time/qcalendarbackend_p.h')
| -rw-r--r-- | src/corelib/time/qcalendarbackend_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/time/qcalendarbackend_p.h b/src/corelib/time/qcalendarbackend_p.h index 12db8928ca..21506e9e2c 100644 --- a/src/corelib/time/qcalendarbackend_p.h +++ b/src/corelib/time/qcalendarbackend_p.h @@ -95,9 +95,9 @@ public: virtual bool isSolar() const = 0; virtual bool isProleptic() const; virtual bool hasYearZero() const; - virtual int maxDaysInMonth() const; - virtual int minDaysInMonth() const; - virtual int maxMonthsInYear() const; + virtual int maximumDaysInMonth() const; + virtual int minimumDaysInMonth() const; + virtual int maximumMonthsInYear() const; // Julian Day conversions: virtual bool dateToJulianDay(int year, int month, int day, qint64 *jd) const = 0; virtual QCalendar::YearMonthDay julianDayToDate(qint64 jd) const = 0; |