summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-11-04 12:38:50 +0100
committerKai Koehne <kai.koehne@qt.io>2016-11-08 15:30:33 +0000
commitaa7e764058cb820c86341c91360976b6bddfd4da (patch)
treef103a7fbe9d957bb5f30a39c6178067d7428d02f /src
parentef5b4d2ada000dcbd239b1cedfb38104e3f40d29 (diff)
MinGW: Explicitly define NTDDI_VERSION
Define NTDDI_VERSION, just like _WIN32_WINNT, to be Windows Vista. Usually NTDDI_VERSION is automatically set by MinGW headers to the value that matches _WIN32_WINNT. However, for precompiled headers the inclusion order is that _WIN32_WINNT is set _after_ the relevant MinGW header is parsed, so this can fail. The alternative would be to set _WIN32_WINNT via a compiler flag, e.g. in the mkspecs. Change-Id: Id59e7083f0d3e00491b54e87647c6c9fabb99795 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qt_windows.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h
index 7b95501c08..bc48104edc 100644
--- a/src/corelib/global/qt_windows.h
+++ b/src/corelib/global/qt_windows.h
@@ -53,6 +53,9 @@
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x600
# endif
+# ifndef NTDDI_VERSION
+# define NTDDI_VERSION 0x06000000
+# endif
#endif
#ifndef NOMINMAX