diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/tools/qdatetimeparser.cpp | 4 | ||||
-rw-r--r-- | src/corelib/tools/qdatetimeparser_p.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qcalendarwidget.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/tools/qdatetimeparser.cpp b/src/corelib/tools/qdatetimeparser.cpp index dd277f7753..15a2e58e1b 100644 --- a/src/corelib/tools/qdatetimeparser.cpp +++ b/src/corelib/tools/qdatetimeparser.cpp @@ -1455,8 +1455,8 @@ QDateTimeParser::parse(QString input, int position, const QDateTime &defaultValu } else { if (context == FromString) { // optimization - Q_ASSERT(maximum.date().toJulianDay() == 4642999); - if (scan.value.date().toJulianDay() > 4642999) + Q_ASSERT(maximum.date().toJulianDay() == 5373484); + if (scan.value.date().toJulianDay() > 5373484) scan.state = Invalid; } else { if (scan.value > maximum) diff --git a/src/corelib/tools/qdatetimeparser_p.h b/src/corelib/tools/qdatetimeparser_p.h index 75497f5c5a..c4afef0193 100644 --- a/src/corelib/tools/qdatetimeparser_p.h +++ b/src/corelib/tools/qdatetimeparser_p.h @@ -69,7 +69,7 @@ QT_REQUIRE_CONFIG(datetimeparser); #define QDATETIMEEDIT_TIME_MAX QTime(23, 59, 59, 999) #define QDATETIMEEDIT_DATE_MIN QDate(100, 1, 1) #define QDATETIMEEDIT_COMPAT_DATE_MIN QDate(1752, 9, 14) -#define QDATETIMEEDIT_DATE_MAX QDate(7999, 12, 31) +#define QDATETIMEEDIT_DATE_MAX QDate(9999, 12, 31) #define QDATETIMEEDIT_DATETIME_MIN QDateTime(QDATETIMEEDIT_DATE_MIN, QDATETIMEEDIT_TIME_MIN) #define QDATETIMEEDIT_COMPAT_DATETIME_MIN QDateTime(QDATETIMEEDIT_COMPAT_DATE_MIN, QDATETIMEEDIT_TIME_MIN) #define QDATETIMEEDIT_DATETIME_MAX QDateTime(QDATETIMEEDIT_DATE_MAX, QDATETIMEEDIT_TIME_MAX) diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index d496d86906..71ad2cf093 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -982,7 +982,7 @@ QCalendarModel::QCalendarModel(QObject *parent) m_firstRow(1), m_date(QDate::currentDate()), m_minimumDate(QDate::fromJulianDay(1)), - m_maximumDate(7999, 12, 31), + m_maximumDate(9999, 12, 31), m_shownYear(m_date.year()), m_shownMonth(m_date.month()), m_firstDay(QLocale().firstDayOfWeek()), diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index b6ec6b4065..6d3e44d21e 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -363,7 +363,7 @@ void QDateTimeEdit::setMinimumDateTime(const QDateTime &dt) clearMaximumDateTime(). By default, this property contains a date that refers to 31 December, - 7999 and a time of 23:59:59 and 999 milliseconds. + 9999 and a time of 23:59:59 and 999 milliseconds. \sa minimumDateTime(), minimumTime(), maximumTime(), minimumDate(), maximumDate(), setDateTimeRange(), setDateRange(), setTimeRange(), @@ -466,7 +466,7 @@ void QDateTimeEdit::clearMinimumDate() necessary to ensure that the range remains valid. If the date is not a valid QDate object, this function does nothing. - By default, this property contains a date that refers to December 31, 7999. + By default, this property contains a date that refers to December 31, 9999. \sa minimumDate, minimumTime, maximumTime, setDateRange() */ |