AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Don't combine enum values from different enum types"

Browse Source
This commit is contained in:
Volker Hilsheimer 2021-03-17 13:32:23 +01:00 committed by Qt CI Bot
commit eb3395328a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/time/qdatetime.cpp
View File

@ -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: