diff options
Diffstat (limited to 'src/corelib/time/qdatetime.cpp')
| -rw-r--r-- | src/corelib/time/qdatetime.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index c3e9b49b25e..504ededb56f 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -2824,11 +2824,13 @@ QDateTimePrivate::ZoneState QDateTimePrivate::expressUtcAsLocal(qint64 utcMSecs) #if QT_CONFIG(timezone) // Use the system time-zone. if (const auto sys = QTimeZone::systemTimeZone(); sys.isValid()) { result.offset = sys.d->offsetFromUtc(utcMSecs); - if (qAddOverflow(utcMSecs, result.offset * MSECS_PER_SEC, &result.when)) + if (result.offset != QTimeZonePrivate::invalidSeconds()) { + if (qAddOverflow(utcMSecs, result.offset * MSECS_PER_SEC, &result.when)) + return result; + result.dst = sys.d->isDaylightTime(utcMSecs) ? DaylightTime : StandardTime; + result.valid = true; return result; - result.dst = sys.d->isDaylightTime(utcMSecs) ? DaylightTime : StandardTime; - result.valid = true; - return result; + } } #endif // timezone |