diff options
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/config/windows.pri | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 86dd74289879a40dce737459dda22e97036f775 +Subproject bb55175ddb321fcfa440c215b7abe2cb19fe0ee diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 602afbc67..f0c0c8f43 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -39,6 +39,11 @@ msvc { GYP_ARGS += "-G msvs_version=$$MSVS_VERSION" + # The check below is ugly, but necessary, as it seems to be the only reliable way to detect if the host + # architecture is 32 bit. QMAKE_HOST.arch does not work as it returns the architecture that the toolchain + # is building for, not the system's actual architecture. + PROGRAM_FILES_X86 = $$(ProgramW6432) + isEmpty(PROGRAM_FILES_X86): GYP_ARGS += "-D windows_sdk_path=\"C:/Program Files/Windows Kits/8.1\"" } else { fatal("Qt WebEngine for Windows can only be built with the Microsoft Visual Studio C++ compiler") } |