1 files changed, 12 insertions, 22 deletions
diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h
index 7a04443079..f93afd1519 100644
--- a/src/widgets/widgets/qdatetimeedit_p.h
+++ b/src/widgets/widgets/qdatetimeedit_p.h
@@ -17,6 +17,8 @@
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/qcalendar.h>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qtimezone.h>
 #include "QtWidgets/qcalendarwidget.h"
 #include "QtWidgets/qspinbox.h"
 #include "QtWidgets/qtoolbutton.h"
@@ -26,6 +28,7 @@
 #include "private/qdatetimeparser_p.h"
 
 #include "qdebug.h"
+#include <QtCore/qpointer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -34,7 +37,7 @@ class Q_AUTOTEST_EXPORT QDateTimeEditPrivate : public QAbstractSpinBoxPrivate, p
 {
     Q_DECLARE_PUBLIC(QDateTimeEdit)
 public:
-    QDateTimeEditPrivate(Qt::TimeSpec timeSpec = Qt::LocalTime);
+    QDateTimeEditPrivate(const QTimeZone &zone = QTimeZone::LocalTime);
 
     void init(const QVariant &var);
     void readLocaleSettings();
@@ -47,7 +50,7 @@ public:
     void emitSignals(EmitPolicy ep, const QVariant &old) override;
     QString textFromValue(const QVariant &f) const override;
     QVariant valueFromText(const QString &f) const override;
-    void _q_editorCursorPositionChanged(int oldpos, int newpos) override;
+    void editorCursorPositionChanged(int oldpos, int newpos) override;
     void interpret(EmitPolicy ep) override;
     void clearCache() const override;
     QStyle::SubControl newHoverControl(const QPoint &pos) override;
@@ -58,27 +61,13 @@ public:
 
     // Override QDateTimeParser:
     QString displayText() const override { return edit->text(); }
-    QDateTime getMinimum() const override
-    {
-        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_MAX.endOfDay(spec));
-        return QDateTimeParser::getMaximum();
-    }
+    QDateTime getMinimum() const override;
+    QDateTime getMaximum() const override;
     QLocale locale() const override { return q_func()->locale(); }
     int cursorPosition() const override { return edit ? edit->cursorPosition() : -1; }
 
     int absoluteIndex(QDateTimeEdit::Section s, int index) const;
-    int absoluteIndex(const SectionNode &s) const;
+    int absoluteIndex(SectionNode s) const;
     QDateTime stepBy(int index, int steps, bool test = false) const;
     int sectionAt(int pos) const;
     int closestSection(int index, bool forward) const;
@@ -87,9 +76,10 @@ public:
 
     void updateCache(const QVariant &val, const QString &str) const;
 
-    QDateTime convertTimeSpec(const QDateTime &datetime);
-    void updateTimeSpec();
+    QDateTime convertTimeZone(const QDateTime &datetime);
+    void updateTimeZone();
     QString valueToText(const QVariant &var) const { return textFromValue(var); }
+    QDateTime dateTimeValue(QDate date, QTime time) const;
 
     void _q_resetButton();
     void updateArrow(QStyle::StateFlag state);
@@ -117,7 +107,7 @@ public:
     bool focusOnButton = false;
 #endif
 
-    Qt::TimeSpec spec;
+    QTimeZone timeZone;
 };