diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-23 10:32:52 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-30 17:36:57 +0000 |
| commit | 137353315c936b901367e9fa052ecc4b6a6b0820 (patch) | |
| tree | ea35c040ba8d4037aaeb45cc22ad631943af6a34 /src/corelib/corelib.pro | |
| parent | bf537516a93ae9297a90a6369a3f613ded0dc84c (diff) | |
QtCore: Increase Windows API level to 0x600 (Windows Vista).
Bump WINVER, _WIN32_WINNT in qt_windows.h and add a define in corelib.pro
overriding the definition in _mingw.h which would otherwise cause a conflict
in the precompiled header.
Task-number: QTBUG-51673
Change-Id: I1428a74b2f00295afd06a0af7769ebf729daebb9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib/corelib.pro')
| -rw-r--r-- | src/corelib/corelib.pro | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 362ac37a59..9a5e832dcb 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -47,8 +47,14 @@ include(statemachine/statemachine.pri) include(mimetypes/mimetypes.pri) include(xml/xml.pri) -# otherwise mingw headers do not declare common functions like putenv -mingw: CONFIG -= strict_c++ +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 + } +} mac|darwin { !ios { |