Handle specified time-spec in date-time parsing

When a date-time was parsed from a string, the result was equal (as a
date-time) to the correct value, but had (at least in some cases) the
wrong spec, where it should have had a spec reflecting the zone
specifier parsed.

The time-spec imposed for the benefit of QDateTimeEdit is now moved
from QDateTimeParser to QDateTimeEditPrivate, which takes over
responsibility for imposing it. QDateTimeParser assumes Qt::LocalTime
in member functions (where applicable) and uses the time-spec parsed
from the string when constructing the date-time.

QDateTime::fromString() and QLocale::toDateTime() are updated to
use the full QDateTime returned by QDateTimeParser.

Fixes: QTBUG-83075
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I8b79add2c7fc13a200e1252d48dbfa70b36757bf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h
index 323246a87b..7df2b59710 100644
--- a/src/widgets/widgets/qdatetimeedit_p.h
+++ b/src/widgets/widgets/qdatetimeedit_p.h
@@ -98,12 +98,16 @@ public:
     {
         if (keyboardTracking)
             return minimum.toDateTime();
+        if (spec != Qt::LocalTime)
+            return QDateTime(QDATETIMEEDIT_DATE_MIN.startOfDay(spec));
         return QDateTimeParser::getMinimum();
     }
     QDateTime getMaximum() const override
     {
         if (keyboardTracking)
             return maximum.toDateTime();
+        if (spec != Qt::LocalTime)
+            return QDateTime(QDATETIMEEDIT_DATE_MIN.startOfDay(spec));
         return QDateTimeParser::getMaximum();
     }
     QLocale locale() const override { return q_func()->locale(); }
@@ -148,6 +152,8 @@ public:
 #ifdef QT_KEYPAD_NAVIGATION
     bool focusOnButton;
 #endif
+
+    Qt::TimeSpec spec = Qt::LocalTime;
 };