diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-17 13:32:23 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-18 11:46:02 +0100 |
| commit | 20639d565bf26b01d915db2e42daedf3f905f399 (patch) | |
| tree | 4d0d0e3e089664d58ac3bb1a22b3d9433658923c /src/corelib/time | |
| parent | f49c6a5672d5c4370c8fb594fbcd4ac6d3d49eea (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.
Pick-to: 6.1
Change-Id: I61c9dcdc42ccd2b01a6208e067d216107672cc4d
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/time')
| -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 979ec12ff0..701df4a06b 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -2937,8 +2937,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: |