From 0a07f9528c56615a38b305e8ba8b8b9dc433f260 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 27 May 2020 13:52:53 +0200
Subject: [PATCH] Never include windows.h directly in Qt code

Please use qt_windows.h instead, so we avoid having min/max defined.

Change-Id: Ic1b29666c427bf24556da5494af45ee5953ae827
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/gui/opengl/qopenglext.h | 2 +-
 src/testlib/qtestcase.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h
index e3f9205619..8264f9d357 100644
--- a/src/gui/opengl/qopenglext.h
+++ b/src/gui/opengl/qopenglext.h
@@ -44,7 +44,7 @@ extern "C" {
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
 #endif
-#include <windows.h>
+#include <qt_windows.h>
 #endif
 
 #ifndef APIENTRY
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index e1da9e617c..f25beee485 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -102,7 +102,7 @@
 # if !defined(Q_CC_MINGW) || (defined(Q_CC_MINGW) && defined(__MINGW64_VERSION_MAJOR))
 #  include <crtdbg.h>
 # endif
-#include <windows.h> // for Sleep
+#include <qt_windows.h> // for Sleep
 #endif
 #ifdef Q_OS_UNIX
 #include <errno.h>