diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-17 13:32:23 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-18 13:53:04 +0000 |
commit | 47a7a595c32a477c9b8de7bd92d44378ed32bed0 (patch) | |
tree | 129e49ca70cc149bb6da59965f11b005fa32f816 | |
parent | c20ad7f10166b2fbd292836b6809dfcf2e65b46c (diff) |
Don't combine enum values from different enum types
Address static analyzer warning dceb66e05690ed1fb2f1455a9eb517f6.
C++20 is deprecating arithmetic operations between unrelated enumeration
types, and not all of the enums involved here are clearly bitmasks.
Change-Id: I61c9dcdc42ccd2b01a6208e067d216107672cc4d
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 20639d565bf26b01d915db2e42daedf3f905f399)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/corelib/time/qdatetime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 62a5531c03..b4fc0dce55 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -2925,8 +2925,8 @@ static void checkValidDateTime(QDateTimeData &d) static void setTimeSpec(QDateTimeData &d, Qt::TimeSpec spec, int offsetSeconds) { auto status = getStatus(d); - status &= ~(QDateTimePrivate::ValidDateTime | QDateTimePrivate::DaylightMask | - QDateTimePrivate::TimeSpecMask); + status &= ~(uint(QDateTimePrivate::ValidDateTime) | uint(QDateTimePrivate::DaylightMask) | + uint(QDateTimePrivate::TimeSpecMask)); switch (spec) { case Qt::OffsetFromUTC: |