diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-09-28 23:54:32 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-10-19 10:58:59 +0000 |
| commit | d57a7c41712f8627a462d893329dc3f0dbb52d32 (patch) | |
| tree | ac0589c3aeba32384abcc506ddd5495ff6fe0c31 /src/corelib | |
| parent | a1c985c10bf2212e911777568c6e344456293a65 (diff) | |
MinGW: Globally define WINVER and _WIN32_WINNT to enable Windows 7 API
Change-Id: I637b33ba6d05f40486d8da927ae5cc5148299348
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/corelib.pro | 2 | ||||
| -rw-r--r-- | src/corelib/global/qt_windows.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 7f018bdb94..6dc11e1a4d 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -50,8 +50,6 @@ win32 { mingw { # otherwise mingw headers do not declare common functions like putenv CONFIG -= strict_c++ - # Override MinGW's definition in _mingw.h - DEFINES += WINVER=0x600 _WIN32_WINNT=0x0600 } LIBS_PRIVATE += -lws2_32 !winrt { diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h index bc48104edc..67ba27f072 100644 --- a/src/corelib/global/qt_windows.h +++ b/src/corelib/global/qt_windows.h @@ -48,10 +48,10 @@ #if defined(Q_CC_MINGW) // mingw's windows.h does not set _WIN32_WINNT, resulting breaking compilation # ifndef WINVER -# define WINVER 0x600 +# define WINVER 0x601 # endif # ifndef _WIN32_WINNT -# define _WIN32_WINNT 0x600 +# define _WIN32_WINNT 0x601 # endif # ifndef NTDDI_VERSION # define NTDDI_VERSION 0x06000000 |