diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-23 01:00:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-23 01:00:36 +0200 |
| commit | 7f895553ace11d8afe5ae280e3c9a68264a6ea87 (patch) | |
| tree | 8e0af6e7f95949fab8a711ebd04bc20977e2c730 /tests | |
| parent | c6128fc67cda7f14432203b1ec7408a527053bdb (diff) | |
| parent | e0a78bf4501c3102578d2de02c95418fa5bb4611 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iaa439ba7dff19a17e3716b3d30f49f60fa6e38f8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp | 5 |
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 a6a68b66ed..07f83d1a63 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -2551,6 +2551,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); } |