diff options
| author | Lars Knoll <[email protected]> | 2020-05-27 13:52:53 +0200 |
|---|---|---|
| committer | Friedemann Kleint <[email protected]> | 2020-05-27 12:41:52 +0000 |
| commit | 0a07f9528c56615a38b305e8ba8b8b9dc433f260 (patch) | |
| tree | 7c72353c822a9da343323df5f83eaf6230d51e2d | |
| parent | af4e8e21f8a32f0eb463423f6808eb431a9afe71 (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/gui/opengl/qopenglext.h | 2 | ||||
| -rw-r--r-- | 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 e3f9205619c..8264f9d3572 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 e1da9e617c1..f25beee4858 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> |