diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-12-10 16:19:17 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-12-10 18:28:39 +0100 |
| commit | ac1008c16f58d95ae4ff0a7864e3bcb0783cc439 (patch) | |
| tree | 4f2a19afcd7344076a5421750e2ba0f85c84dda1 /src | |
| parent | d5bafc80cd38202464576f3e0b38de645bb2dc64 (diff) | |
Check date validity in calendar methods taking a QDate
Previously neglected, in dateFromParts() and dayOfWeek(), which only
make sense for valid dates.
Pick-to: 6.0 5.15
Change-Id: I44879bb441dbf51b96c8fd4d45e8f07423e63047
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/time/qcalendar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/time/qcalendar.cpp b/src/corelib/time/qcalendar.cpp index af3c16a19f..3c74ffe099 100644 --- a/src/corelib/time/qcalendar.cpp +++ b/src/corelib/time/qcalendar.cpp @@ -1060,7 +1060,7 @@ QDate QCalendar::dateFromParts(const QCalendar::YearMonthDay &parts) const */ QCalendar::YearMonthDay QCalendar::partsFromDate(QDate date) const { - return d ? d->julianDayToDate(date.toJulianDay()) : YearMonthDay(); + return d && date.isValid() ? d->julianDayToDate(date.toJulianDay()) : YearMonthDay(); } /*! @@ -1074,7 +1074,7 @@ QCalendar::YearMonthDay QCalendar::partsFromDate(QDate date) const */ int QCalendar::dayOfWeek(QDate date) const { - return d ? d->dayOfWeek(date.toJulianDay()) : 0; + return d && date.isValid() ? d->dayOfWeek(date.toJulianDay()) : 0; } // Locale data access |