diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2020-10-08 19:07:57 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-10-09 16:15:17 +0200 |
| commit | 27499d25fb6d5b12ee6f97f5a6bedcde53b2dcee (patch) | |
| tree | 02d9ea89184201a028ba16478def0d9855f43b20 | |
| parent | df1309c83a3202ed20c21c4259300b8118c42b5f (diff) | |
MinGW: Fix static build using PCH
The value of NTDDI_VERSION is computed from _WIN32_WINNT. It makes
sense to keep these two in sync.
The value used to create the PCHs for _WIN32_WINNT is 0x601, and
qwindowspointerhandler.cpp requires for MinGW 0x603. Since the
precompile header value cannot be undefined while compiling the
source file, it's better not to use the PCH for this particular
source file.
These problems surface in a static build, in a regular build for
some reason the PCH for plugins is not used.
Change-Id: Id724490deb9c695ac00b26cd300f9d2382019ea2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/corelib/global/qt_windows.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/CMakeLists.txt | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h index 67ba27f072..7ffe313f00 100644 --- a/src/corelib/global/qt_windows.h +++ b/src/corelib/global/qt_windows.h @@ -54,7 +54,7 @@ # define _WIN32_WINNT 0x601 # endif # ifndef NTDDI_VERSION -# define NTDDI_VERSION 0x06000000 +# define NTDDI_VERSION 0x06010000 # endif #endif diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 2f1182190d..77d2f2a714 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -198,3 +198,9 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATU PUBLIC_LIBRARIES uuid ) + +# begin special case +if (MINGW) + set_source_files_properties(qwindowspointerhandler.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON) +endif() +# end special case |