From 4167a920ed36a5756a07668c3993d723ffbc60bf Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 15 Mar 2022 16:28:57 +0100 Subject: QDateTime: enable larger ShortData for bootstrapped build Ensures we get a modicum of testing of the Qt7 32-bit code in. Change-Id: I0838e4340265e19ab2b17a1a91a11ef5f9948893 Reviewed-by: Qt CI Bot Reviewed-by: Edward Welbourne --- src/corelib/time/qdatetime.cpp | 2 +- src/corelib/time/qdatetime.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 7374af557d..4400c67c16 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -3613,7 +3613,7 @@ inline qint64 QDateTimePrivate::zoneMSecsToEpochMSecs(qint64 zoneMSecs, const QT */ QDateTime::QDateTime() noexcept { -#if QT_VERSION >= QT_VERSION_CHECK(7,0,0) || QT_POINTER_SIZE == 8 +#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) || defined(QT_BOOTSTRAPPED) || QT_POINTER_SIZE == 8 static_assert(sizeof(ShortData) == sizeof(qint64)); static_assert(sizeof(Data) == sizeof(qint64)); #endif diff --git a/src/corelib/time/qdatetime.h b/src/corelib/time/qdatetime.h index c1c67398a3..15a1397ef8 100644 --- a/src/corelib/time/qdatetime.h +++ b/src/corelib/time/qdatetime.h @@ -240,7 +240,7 @@ class Q_CORE_EXPORT QDateTime #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN quintptr status : 8; #endif -#if QT_VERSION >= QT_VERSION_CHECK(7,0,0) +#if QT_VERSION >= QT_VERSION_CHECK(7,0,0) || defined(QT_BOOTSTRAPPED) qint64 msecs : 56; #else // note: this is only 24 bits on 32-bit systems... -- cgit v1.2.3