diff options
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 13 | ||||
-rw-r--r-- | src/widgets/widgets/qdatetimeedit_p.h | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index b150827a4d..81b70b5f90 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -223,7 +223,9 @@ QDateTimeEdit::QDateTimeEdit(QTime time, QWidget *parent) \internal */ QDateTimeEdit::QDateTimeEdit(const QVariant &var, QMetaType::Type parserType, QWidget *parent) - : QAbstractSpinBox(*new QDateTimeEditPrivate, parent) + : QAbstractSpinBox(*new QDateTimeEditPrivate( + parserType == QMetaType::QDateTime ? Qt::LocalTime : Qt::UTC), + parent) { Q_D(QDateTimeEdit); d->parserType = parserType; @@ -1734,16 +1736,17 @@ QDateEdit::~QDateEdit() */ -QDateTimeEditPrivate::QDateTimeEditPrivate() - : QDateTimeParser(QMetaType::QDateTime, QDateTimeParser::DateTimeEdit, QCalendar()) +QDateTimeEditPrivate::QDateTimeEditPrivate(Qt::TimeSpec timeSpec) + : QDateTimeParser(QMetaType::QDateTime, QDateTimeParser::DateTimeEdit, QCalendar()), + spec(timeSpec) { fixday = true; type = QMetaType::QDateTime; currentSectionIndex = FirstSectionIndex; first.pos = 0; - minimum = QDATETIMEEDIT_COMPAT_DATE_MIN.startOfDay(); - maximum = QDATETIMEEDIT_DATE_MAX.endOfDay(); + minimum = QDATETIMEEDIT_COMPAT_DATE_MIN.startOfDay(spec); + maximum = QDATETIMEEDIT_DATE_MAX.endOfDay(spec); readLocaleSettings(); } diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index 5830caaba3..550653d731 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -70,7 +70,7 @@ class Q_AUTOTEST_EXPORT QDateTimeEditPrivate : public QAbstractSpinBoxPrivate, p { Q_DECLARE_PUBLIC(QDateTimeEdit) public: - QDateTimeEditPrivate(); + QDateTimeEditPrivate(Qt::TimeSpec timeSpec = Qt::LocalTime); void init(const QVariant &var); void readLocaleSettings(); @@ -153,7 +153,7 @@ public: bool focusOnButton = false; #endif - Qt::TimeSpec spec = Qt::LocalTime; + Qt::TimeSpec spec; }; |