1 files changed, 11 insertions, 10 deletions

diff --git a/src/corelib/time/qdatetimeparser_p.h b/src/corelib/time/qdatetimeparser_p.h
index 2bc118ca49..faf383f3d7 100644
--- a/src/corelib/time/qdatetimeparser_p.h
+++ b/src/corelib/time/qdatetimeparser_p.h
@@ -46,7 +46,7 @@ public:
         FromString,
         DateTimeEdit
     };
-    QDateTimeParser(QMetaType::Type t, Context ctx, const QCalendar &cal = QCalendar())
+    QDateTimeParser(QMetaType::Type t, Context ctx, QCalendar cal = QCalendar())
         : parserType(t), context(ctx), calendar(cal)
     {
         defaultLocale = QLocale::system();
@@ -136,8 +136,9 @@ public:
 
     StateNode parse(const QString &input, int position,
                     const QDateTime &defaultValue, bool fixup) const;
-    bool fromString(const QString &text, QDate *date, QTime *time) const;
-    bool fromString(const QString &text, QDateTime* datetime) const;
+    bool fromString(const QString &text, QDate *date, QTime *time,
+                    int baseYear = QLocale::DefaultTwoDigitBaseYear) const;
+    bool fromString(const QString &text, QDateTime *datetime, int baseYear) const;
     bool parseFormat(QStringView format);
 
     enum FieldInfoFlag {
@@ -152,7 +153,7 @@ public:
 
     void setDefaultLocale(const QLocale &loc) { defaultLocale = loc; }
     virtual QString displayText() const { return m_text; }
-    void setCalendar(const QCalendar &calendar);
+    void setCalendar(QCalendar calendar);
 
 private:
     int sectionMaxSize(Section s, int count) const;
@@ -169,16 +170,14 @@ private:
             {}
     };
     ParsedSection parseSection(const QDateTime &currentValue, int sectionIndex, int offset) const;
-    int findMonth(const QString &str1, int monthstart, int sectionIndex,
+    int findMonth(QStringView str, int monthstart, int sectionIndex,
                   int year, QString *monthName = nullptr, int *used = nullptr) const;
-    int findDay(const QString &str1, int intDaystart, int sectionIndex,
+    int findDay(QStringView str, int intDaystart, int sectionIndex,
                 QString *dayName = nullptr, int *used = nullptr) const;
-    ParsedSection findUtcOffset(QStringView str) const;
+    ParsedSection findUtcOffset(QStringView str, int mode) const;
     ParsedSection findTimeZoneName(QStringView str, const QDateTime &when) const;
     ParsedSection findTimeZone(QStringView str, const QDateTime &when,
-                               int maxVal, int minVal) const;
-    // Implemented in qlocaltime.cpp:
-    static int startsWithLocalTimeZone(const QStringView name);
+                               int maxVal, int minVal, int mode) const;
 
     enum AmPmFinder {
         Neither = -1,
@@ -205,6 +204,7 @@ private:
     };
 
     QString getAmPmText(AmPm ap, Case cs) const;
+    QDateTime baseDate(const QTimeZone &zone) const;
 
     friend class QDTPUnitTestParser;
 
@@ -236,6 +236,7 @@ protected: // for the benefit of QDateTimeEditPrivate
     virtual QLocale locale() const { return defaultLocale; }
 
     mutable int currentSectionIndex = int(NoSectionIndex);
+    mutable int defaultCenturyStart = QLocale::DefaultTwoDigitBaseYear;
     Sections display;
     /*
         This stores the most recently selected day.