AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Never include windows.h directly in Qt code

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

Change-Id: Ic1b29666c427bf24556da5494af45ee5953ae827
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Lars Knoll 2020-05-27 13:52:53 +02:00 committed by Friedemann Kleint
parent af4e8e21f8
commit 0a07f9528c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/opengl/qopenglext.h
View File

@ -44,7 +44,7 @@ extern "C" {
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1 #define WIN32_LEAN_AND_MEAN 1
#endif #endif
#include <windows.h> #include <qt_windows.h>
#endif #endif
#ifndef APIENTRY #ifndef APIENTRY

2
src/testlib/qtestcase.cpp
View File

@ -102,7 +102,7 @@
# if !defined(Q_CC_MINGW) || (defined(Q_CC_MINGW) && defined(__MINGW64_VERSION_MAJOR)) # if !defined(Q_CC_MINGW) || (defined(Q_CC_MINGW) && defined(__MINGW64_VERSION_MAJOR))
# include <crtdbg.h> # include <crtdbg.h>
# endif # endif
#include <windows.h> // for Sleep #include <qt_windows.h> // for Sleep
#endif #endif
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
#include <errno.h> #include <errno.h>