diff options
author | Yuhang Zhao <2546789017@qq.com> | 2022-10-14 16:08:23 +0800 |
---|---|---|
committer | Yuhang Zhao <2546789017@qq.com> | 2022-10-24 13:22:24 +0800 |
commit | bea5649cd18b75a88aba235b5def55c422d9d1e7 (patch) | |
tree | 3b1861289e7e599d94a08f79289b1550fe3c8bb6 /src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | |
parent | 0ae36affedd553640a282086c1703de48b1b449e (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/plugins/platforms/windows/qwindowsdialoghelpers.cpp')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 488020ec0c..c81e53e7ab 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -3,10 +3,6 @@ #define QT_NO_URL_CAST_FROM_STRING 1 -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0A00 -#endif - #include <QtCore/qt_windows.h> #include "qwindowscombase.h" #include "qwindowsdialoghelpers.h" |