From cbf29a8720895bb34ee17eed0debeaa94d2ce4e4 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Tue, 23 May 2023 10:34:18 +0200
Subject: [PATCH] Guard qwindowscombase.h with qt_windows.h include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

qwindowscombase.h pulls in windows.h so not guarding its content by
including qt_windows.h might cause hard to track down issues like
min/max macros being defined.

Pick-to: 6.5 6.2 5.15
Change-Id: I3c48660ed87122bb0c4f6830c8d0b288ec62a509
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
Reviewed-by: Timothée Keller <timothee.keller@qt.io>
---
 src/plugins/platforms/windows/qwindowscombase.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/platforms/windows/qwindowscombase.h b/src/plugins/platforms/windows/qwindowscombase.h
index 04d4dc51cf8..b383d69ec40 100644
--- a/src/plugins/platforms/windows/qwindowscombase.h
+++ b/src/plugins/platforms/windows/qwindowscombase.h
@@ -4,6 +4,8 @@
 #ifndef QWINDOWSCOMBASE_H
 #define QWINDOWSCOMBASE_H
 
+#include <qt_windows.h>
+
 #include <QtCore/qglobal.h>
 
 #include <unknwn.h>