From 76c2e9ea23e6bf9e9783813c89c80737ac72d468 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 16 Feb 2021 15:36:40 +0100 Subject: Fix a typo, simplify an increment, add an assertion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Trivial details picked up during the course of investigating a time-zone issue. Change-Id: I4d6e7ab1787a2500bd950e7f12ed8618a31f1f8e Reviewed-by: Mårten Nordheim Reviewed-by: Andrei Golubev --- src/corelib/time/qdatetime.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 42b9ffcc47..743a94ab7a 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -3844,7 +3844,7 @@ qint64 QDateTime::toMSecsSinceEpoch() const case Qt::TimeZone: Q_ASSERT(!d.isShort()); #if QT_CONFIG(timezone) - // Use offset refreshZonedDateTime() saved creation: + // Use offset refreshZonedDateTime() saved on creation: if (d->m_timeZone.isValid()) return d->m_msecs - d->m_offsetFromUtc * 1000; #endif @@ -3899,7 +3899,7 @@ void QDateTime::setMSecsSinceEpoch(qint64 msecs) status |= QDateTimePrivate::ValidWhenMask; break; case Qt::OffsetFromUTC: - msecs = msecs + (d->m_offsetFromUtc * 1000); + msecs += d->m_offsetFromUtc * 1000; status |= QDateTimePrivate::ValidWhenMask; break; case Qt::TimeZone: @@ -3947,8 +3947,10 @@ void QDateTime::setMSecsSinceEpoch(qint64 msecs) d->m_msecs = msecs; } - if (spec == Qt::LocalTime || spec == Qt::TimeZone) + if (spec == Qt::LocalTime || spec == Qt::TimeZone) { refreshZonedDateTime(d, spec); + Q_ASSERT((d.isShort() ? d.data.msecs : d->m_msecs) == msecs); + } } /*! -- cgit v1.2.3