summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorYuhang Zhao <2546789017@qq.com>2022-10-14 16:08:23 +0800
committerYuhang Zhao <2546789017@qq.com>2022-10-24 13:22:24 +0800
commitbea5649cd18b75a88aba235b5def55c422d9d1e7 (patch)
tree3b1861289e7e599d94a08f79289b1550fe3c8bb6 /src/corelib/global
parent0ae36affedd553640a282086c1703de48b1b449e (diff)
Windows: bump NTDDI_VERSION to latest version and remove some duplicated code
We have NTDDI_WIN10_NI (0x0A00000C) in the Win11 SDK (10.0.22621) so bump the value in Qt (currently 0x0A00000B) to it. And when searching for _WIN32_WINNT/WINVER/NTDDI_VERSION throughout the whole qtbase codebase, I found some duplicated code, mostly leftovers from the legacy time. Replace them with our own windows header can achieve the same effect: we have defined all the necessary macros to unblock the latest features. And place the header at the top most place to include the macros as early as possible. Change-Id: I37d9ac40ca9748208c7b2e89f374eda362dbefd6 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qt_windows.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h
index 17ed094c1d..5586d0b927 100644
--- a/src/corelib/global/qt_windows.h
+++ b/src/corelib/global/qt_windows.h
@@ -19,7 +19,7 @@
# define _WIN32_IE 0x0A00
#endif
#ifndef NTDDI_VERSION
-# define NTDDI_VERSION 0x0A00000B // NTDDI_WIN10_CO
+# define NTDDI_VERSION 0x0A00000C // NTDDI_WIN10_NI
#endif
#ifndef NOMINMAX