diff options
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qdatetime_p.h | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 7be3f56d60..6ab4e3a118 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -2488,7 +2488,8 @@ QDateTimePrivate::QDateTimePrivate(const QDate &toDate, const QTime &toTime, Qt: int offsetSeconds) : m_msecs(0), m_status(0), - m_offsetFromUtc(0) + m_offsetFromUtc(0), + ref(0) { setTimeSpec(toSpec, offsetSeconds); setDateTime(toDate, toTime); @@ -2499,6 +2500,7 @@ QDateTimePrivate::QDateTimePrivate(const QDate &toDate, const QTime &toTime, const QTimeZone &toTimeZone) : m_status(0), m_offsetFromUtc(0), + ref(0), m_timeZone(toTimeZone) { setSpec(Qt::TimeZone); diff --git a/src/corelib/tools/qdatetime_p.h b/src/corelib/tools/qdatetime_p.h index 65905765fc..3c9d453977 100644 --- a/src/corelib/tools/qdatetime_p.h +++ b/src/corelib/tools/qdatetime_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE -class QDateTimePrivate : public QSharedData +class QDateTimePrivate { public: // Never change or delete this enum, it is required for backwards compatible @@ -105,7 +105,8 @@ public: QDateTimePrivate() : m_msecs(0), m_status(StatusFlag(Qt::LocalTime << TimeSpecShift)), - m_offsetFromUtc(0) + m_offsetFromUtc(0), + ref(0) { } @@ -116,12 +117,10 @@ public: QDateTimePrivate(const QDate &toDate, const QTime &toTime, const QTimeZone & timeZone); #endif // QT_BOOTSTRAPPED - // ### XXX: when the tooling situation improves, look at fixing the padding. - // 4 bytes padding - qint64 m_msecs; StatusFlags m_status; int m_offsetFromUtc; + mutable QAtomicInt ref; #ifndef QT_BOOTSTRAPPED QTimeZone m_timeZone; #endif // QT_BOOTSTRAPPED |