diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2022-08-03 14:11:18 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2022-08-04 20:39:52 +0200 |
| commit | 607c5a90c5c575be6ef7755d7e48e37dded2f74e (patch) | |
| tree | ca844b3978abf6d0a8abe844599d393cb6f7828c /src/widgets/widgets/qdatetimeedit.cpp | |
| parent | a46a426b43309c5585bcb8891dd77ac1ab92ff09 (diff) | |
Fix initialization of QDateEdit and QTimeEdit
Since 6.3 these use Qt::UTC as time-spec but I neglected to take that
into account in QDateTimeEditPrivate::init()'s construction of a
QDateTime from the QDate or QTime. This amends
commit c00ee2f31013e99c79b820a0db57003c110a5510.
Fixes: QTBUG-105322
Pick-to: 6.3 6.4
Change-Id: I11dec9808a54cf7da401b1734a9a2812f5fd2e63
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets/widgets/qdatetimeedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 3c9d166dee..897e0dce06 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -2480,7 +2480,7 @@ void QDateTimeEditPrivate::init(const QVariant &var) Q_Q(QDateTimeEdit); switch (var.userType()) { case QMetaType::QDate: - value = var.toDate().startOfDay(); + value = var.toDate().startOfDay(spec); updateTimeSpec(); q->setDisplayFormat(defaultDateFormat); if (sectionNodes.isEmpty()) // ### safeguard for broken locale @@ -2494,7 +2494,7 @@ void QDateTimeEditPrivate::init(const QVariant &var) q->setDisplayFormat("dd/MM/yyyy hh:mm:ss"_L1); break; case QMetaType::QTime: - value = QDateTime(QDATETIMEEDIT_DATE_INITIAL, var.toTime()); + value = QDateTime(QDATETIMEEDIT_DATE_INITIAL, var.toTime(), spec); updateTimeSpec(); q->setDisplayFormat(defaultTimeFormat); if (sectionNodes.isEmpty()) // ### safeguard for broken locale |