summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/time
diff options
context:
space:
mode:
authorAndrei Golubev <andrei.golubev@qt.io>2020-03-25 15:48:52 +0100
committerAndrei Golubev <andrei.golubev@qt.io>2020-04-22 14:14:30 +0300
commit76054516047d8efb8529443830bb4d9ddf01010f (patch)
treeb43f21e2828fb16fe5beb8a2298556d6a3da654d /tests/auto/corelib/time
parent6c45b1817f1f56207dae8aa028b9cbb922dc8008 (diff)
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>
Diffstat (limited to 'tests/auto/corelib/time')
-rw-r--r--tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
index 26ad91271d..08196d8377 100644
--- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
@@ -2554,6 +2554,11 @@ void tst_QDateTime::fromStringStringFormat()
QDateTime dt = QDateTime::fromString(string, format);
+ if (expected.isValid()) {
+ QCOMPARE(dt.timeSpec(), expected.timeSpec());
+ if (expected.timeSpec() == Qt::TimeZone)
+ QCOMPARE(dt.timeZone(), expected.timeZone());
+ }
QCOMPARE(dt, expected);
}