diff options
Diffstat (limited to 'src/corelib/tools/qdatetime.cpp')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index d6f1d6c942..3c01edc83e 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -3194,7 +3194,7 @@ QTimeZone QDateTime::timeZone() const return d->m_timeZone; case Qt::UTC: if (!d->m_timeZone.isValid()) - d->m_timeZone = QTimeZone("UTC"); + d->m_timeZone = QTimeZone(QTimeZonePrivate::utcQByteArray()); return d->m_timeZone; case Qt::TimeZone : return d->m_timeZone; @@ -3254,9 +3254,9 @@ QString QDateTime::timeZoneAbbreviation() const { switch (d->m_spec) { case Qt::UTC: - return QStringLiteral("UTC"); + return QTimeZonePrivate::utcQString(); case Qt::OffsetFromUTC: - return QLatin1String("UTC") + toOffsetString(Qt::ISODate, d->m_offsetFromUtc); + return QTimeZonePrivate::utcQString() + toOffsetString(Qt::ISODate, d->m_offsetFromUtc); case Qt::TimeZone: #ifndef QT_BOOTSTRAPPED return d->m_timeZone.d->abbreviation(d->toMSecsSinceEpoch()); @@ -4976,7 +4976,7 @@ QDataStream &operator>>(QDataStream &in, QDateTime &dateTime) #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_NO_DATESTRING) QDebug operator<<(QDebug dbg, const QDate &date) { - dbg.nospace() << "QDate(" << date.toString(QStringLiteral("yyyy-MM-dd")) << ')'; + dbg.nospace() << "QDate(" << date.toString(Qt::ISODate) << ')'; return dbg.space(); } |