1 files changed, 27 insertions, 9 deletions
diff --git a/src/plugins/platforms/windows/qtwindowsglobal.h b/src/plugins/platforms/windows/qtwindowsglobal.h
index 9a65603e24..96a72600eb 100644
--- a/src/plugins/platforms/windows/qtwindowsglobal.h
+++ b/src/plugins/platforms/windows/qtwindowsglobal.h
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 namespace QtWindows
 {
 
-enum
+enum WindowsEventTypeFlags
 {
     WindowEventFlag = 0x10000,
     MouseEventFlag = 0x20000,
@@ -107,6 +107,7 @@ enum WindowsEventType // Simplify event types
     PointerActivateWindowEvent = WindowEventFlag + 24,
     DpiScaledSizeEvent = WindowEventFlag + 25,
     DpiChangedAfterParentEvent = WindowEventFlag + 27,
+    TaskbarButtonCreated = WindowEventFlag + 28,
     MouseEvent = MouseEventFlag + 1,
     MouseWheelEvent = MouseEventFlag + 2,
     CursorEvent = MouseEventFlag + 3,
@@ -118,7 +119,7 @@ enum WindowsEventType // Simplify event types
     NonClientPointerEvent = NonClientEventFlag + PointerEventFlag + 4,
     KeyEvent = KeyEventFlag + 1,
     KeyDownEvent = KeyEventFlag + KeyDownEventFlag + 1,
-    KeyboardLayoutChangeEvent = KeyEventFlag + 2,
+    InputLanguageChangeEvent = KeyEventFlag + 2,
     InputMethodKeyEvent = InputMethodEventFlag + KeyEventFlag + 1,
     InputMethodKeyDownEvent = InputMethodEventFlag + KeyEventFlag + KeyDownEventFlag + 1,
     ClipboardEvent = ClipboardEventFlag + 1,
@@ -146,20 +147,31 @@ enum WindowsEventType // Simplify event types
     GestureEvent = 124,
     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()
-enum ProcessDpiAwareness
+enum class DpiAwareness
 {
-    ProcessDpiUnaware,
-    ProcessSystemDpiAware,
-    ProcessPerMonitorDpiAware,
-    ProcessPerMonitorV2DpiAware // Qt extension (not in Process_DPI_Awareness)
+    Invalid = -1,
+    Unaware,
+    System,
+    PerMonitor,
+    PerMonitorVersion2,
+    Unaware_GdiScaled
 };
 
 } // namespace QtWindows
 
 inline QtWindows::WindowsEventType windowsEventType(UINT message, WPARAM wParamIn, LPARAM lParamIn)
 {
+    static const UINT WM_TASKBAR_BUTTON_CREATED = []{
+        UINT message = RegisterWindowMessage(L"TaskbarButtonCreated");
+        // In case the application is run elevated, allow the
+        // TaskbarButtonCreated message through.
+        ChangeWindowMessageFilter(message, MSGFLT_ADD);
+        return message;
+    }();
+
     switch (message) {
     case WM_PAINT:
     case WM_ERASEBKGND:
@@ -218,7 +230,7 @@ inline QtWindows::WindowsEventType windowsEventType(UINT message, WPARAM wParamI
         return QtWindows::InputMethodKeyDownEvent;
 #ifdef WM_INPUTLANGCHANGE
     case WM_INPUTLANGCHANGE:
-        return QtWindows::KeyboardLayoutChangeEvent;
+        return QtWindows::InputLanguageChangeEvent;
 #endif // WM_INPUTLANGCHANGE
     case WM_TOUCH:
         return QtWindows::TouchEvent;
@@ -310,9 +322,15 @@ inline QtWindows::WindowsEventType windowsEventType(UINT message, WPARAM wParamI
         return QtWindows::NonClientPointerEvent;
     if (message >= WM_POINTERUPDATE && message <= WM_POINTERHWHEEL)
         return QtWindows::PointerEvent;
+    if (message == WM_TASKBAR_BUTTON_CREATED)
+        return QtWindows::TaskbarButtonCreated;
     return QtWindows::UnknownEvent;
 }
 
+#ifndef QT_NO_DEBUG_STREAM
+extern QDebug operator<<(QDebug, QtWindows::DpiAwareness);
+#endif
+
 QT_END_NAMESPACE
 
 #endif // QTWINDOWSGLOBAL_H