diff options
| -rw-r--r-- | src/corelib/time/qtimezone.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/time/qtimezone.h b/src/corelib/time/qtimezone.h index 20b6df2ad5..273bcc7b1c 100644 --- a/src/corelib/time/qtimezone.h +++ b/src/corelib/time/qtimezone.h @@ -121,13 +121,14 @@ public: static QTimeZone fromDurationAheadOfUtc(std::chrono::seconds offset) { - return fromSecondsAheadOfUtc(int(offset.count())); + return QTimeZone((offset.count() >= MinUtcOffsetSecs && offset.count() <= MaxUtcOffsetSecs) + ? ShortData(offset.count() ? Qt::OffsetFromUTC : Qt::UTC, + int(offset.count())) + : ShortData(Qt::TimeZone)); } static QTimeZone fromSecondsAheadOfUtc(int offset) { - return QTimeZone((offset >= MinUtcOffsetSecs && offset <= MaxUtcOffsetSecs) - ? ShortData(offset ? Qt::OffsetFromUTC : Qt::UTC, offset) - : ShortData(Qt::TimeZone)); + return fromDurationAheadOfUtc(std::chrono::seconds{offset});; } constexpr Qt::TimeSpec timeSpec() const noexcept { return d.s.spec(); } constexpr int fixedSecondsAheadOfUtc() const noexcept |