diff options
Diffstat (limited to 'src/corelib/global/qt_windows.h')
| -rw-r--r-- | src/corelib/global/qt_windows.h | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h index 7ffe313f00..15255b9434 100644 --- a/src/corelib/global/qt_windows.h +++ b/src/corelib/global/qt_windows.h @@ -45,17 +45,17 @@ #pragma qt_sync_stop_processing #endif -#if defined(Q_CC_MINGW) -// mingw's windows.h does not set _WIN32_WINNT, resulting breaking compilation -# ifndef WINVER -# define WINVER 0x601 -# endif -# ifndef _WIN32_WINNT -# define _WIN32_WINNT 0x601 -# endif -# ifndef NTDDI_VERSION -# define NTDDI_VERSION 0x06010000 -# endif +#ifndef WINVER +# define WINVER 0x0A00 // _WIN32_WINNT_WIN10 +#endif +#ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0A00 +#endif +#ifndef _WIN32_IE +# define _WIN32_IE 0x0A00 +#endif +#ifndef NTDDI_VERSION +# define NTDDI_VERSION 0x0A00000B // NTDDI_WIN10_CO #endif #ifndef NOMINMAX @@ -63,13 +63,6 @@ #endif #include <windows.h> -#if defined(_WIN32_IE) && _WIN32_IE < 0x0501 -# undef _WIN32_IE -#endif -#if !defined(_WIN32_IE) -# define _WIN32_IE 0x0501 -#endif - // already defined when compiled with WINVER >= 0x0500 #ifndef SPI_SETMENUANIMATION #define SPI_SETMENUANIMATION 0x1003 |