diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-05-01 21:44:51 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-05-15 12:14:48 -0700 |
| commit | 4d24fcd3e1dce6c56d9fc70ee386dcc8aa552ef6 (patch) | |
| tree | 128db234fb03be1049188c131b292c52361a448c /src/corelib/time/qdatetime.h | |
| parent | c4947c1c4c0d518197329cf019b04cff4e676541 (diff) | |
QDateTime: fix our oversight in Qt 6.0 not changing the ShortData
For 32-bit systems. They're not important (to me), but might as well fix
this oversight.
Change-Id: I755911ae7d0341f49039fffd167b26617db93354
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/time/qdatetime.h')
| -rw-r--r-- | src/corelib/time/qdatetime.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/time/qdatetime.h b/src/corelib/time/qdatetime.h index bc8c09b1e9..80227afde2 100644 --- a/src/corelib/time/qdatetime.h +++ b/src/corelib/time/qdatetime.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. -** Copyright (C) 2016 Intel Corporation. +** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2021 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -240,8 +240,12 @@ 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) + qint64 msecs : 56; +#else // note: this is only 24 bits on 32-bit systems... qintptr msecs : sizeof(void *) * 8 - 8; +#endif #if Q_BYTE_ORDER == Q_BIG_ENDIAN quintptr status : 8; |