diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-03-15 16:28:57 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-03-23 13:46:33 +0000 |
| commit | 4167a920ed36a5756a07668c3993d723ffbc60bf (patch) | |
| tree | fbcad85e713946db4549bafa14f9b8b218c8f266 /src | |
| parent | 4cf299eb5bbdbac8484c2ee8c5afbd260dccc6d5 (diff) | |
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/time/qdatetime.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/time/qdatetime.h | 2 |
2 files changed, 2 insertions, 2 deletions
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... |