diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-03 06:55:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-03 06:57:05 +0100 |
| commit | e62d04b933a91c2bdd347aa97dc15ba210a04d2a (patch) | |
| tree | 67c67af5f59d9b71522738da8a8d2d803e3ff44f /tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp | |
| parent | f81f21151d30a37f955aa4af2398a96507626b15 (diff) | |
| parent | 9ac156c90b92a981f70929e081c64083b14e9a57 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/serialization/qcborvalue.cpp
Change-Id: I675a3029955c96e81a33ed9d98b72b55b6784b52
Diffstat (limited to 'tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp')
| -rw-r--r-- | tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp index d0ef8023b9..332a00efb5 100644 --- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp @@ -46,6 +46,7 @@ private slots: // Public class default system tests void createTest(); void nullTest(); + void systemZone(); void dataStreamTest(); void isTimeZoneIdAvailable(); void availableTimeZoneIds(); @@ -317,6 +318,14 @@ void tst_QTimeZone::nullTest() QCOMPARE(data.daylightTimeOffset, std::numeric_limits<int>::min()); } +void tst_QTimeZone::systemZone() +{ + const QTimeZone zone = QTimeZone::systemTimeZone(); + QVERIFY(zone.isValid()); + QCOMPARE(zone.id(), QTimeZone::systemTimeZoneId()); + QCOMPARE(zone, QTimeZone(QTimeZone::systemTimeZoneId())); +} + void tst_QTimeZone::dataStreamTest() { // Test the OffsetFromUtc backend serialization. First with a custom timezone: |