Merge remote-tracking branch 'origin/5.9.1' into 5.9

Conflicts:
	mkspecs/features/functions.prf

Change-Id: I53d65ea49f546c7d4aadfdaff178fd2f3f4cdf11

1 files changed, 12 insertions, 0 deletions

diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index e8d823b65..56894e58a 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
@@ -26,6 +26,9 @@ defineTest(isPlatformSupported) {
       skipBuild("WinRT is not supported.")
       return(false)
     }
+    isBuildingOnWin32() {
+      skipBuild("Qt WebEngine on Windows must be built on a 64-bit machine.")
+    }
     !msvc|intel_icl {
       skipBuild("Qt WebEngine on Windows requires MSVC.")
       return(false)
@@ -205,6 +208,15 @@ defineTest(isQMLTestSupportApiEnabled) {
     return(false)
 }
 
+defineTest(isBuildingOnWin32) {
+    # 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): return(true)
+    return(false)
+}
+
 defineTest(isMinOSXSDKVersion) {
     requested_major = $$1
     requested_minor = $$2