1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtwindowsglobal: Fix mixed-enum operations warning

Browse Source 
With c++20 doing operations between different enums is
warning(-as-error).
Declare operator-overloads for a particular pair of enums to make this
compile again. Requires giving one of them a name as it was previously
unnamed.

Change-Id: I23296117b6d9a84273da6639582e075d631e5602
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit ba4710a33f408508772464c1e98ecab4378e4ecc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2022-10-24 12:47:27 +02:00 committed by Qt Cherry-pick Bot
parent 5e049224db
commit b3f15cae22
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/windows/qtwindowsglobal.h
View File

@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
namespace QtWindows namespace QtWindows
{ {
enum enum WindowsEventTypeFlags
{ {
WindowEventFlag = 0x10000, WindowEventFlag = 0x10000,
MouseEventFlag = 0x20000, MouseEventFlag = 0x20000,
@ -146,6 +146,8 @@ enum WindowsEventType // Simplify event types
GestureEvent = 124, GestureEvent = 124,
UnknownEvent = 542 UnknownEvent = 542
}; };
Q_DECLARE_MIXED_ENUM_OPERATORS(bool, WindowsEventTypeFlags, WindowsEventType);
Q_DECLARE_MIXED_ENUM_OPERATORS(bool, WindowsEventType, WindowsEventTypeFlags);
// Matches Process_DPI_Awareness (Windows 8.1 onwards), used for SetProcessDpiAwareness() // Matches Process_DPI_Awareness (Windows 8.1 onwards), used for SetProcessDpiAwareness()
enum ProcessDpiAwareness enum ProcessDpiAwareness