From 53b632ee0b6dc92ffc4f94f88755d94f7533637a Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 16 Jun 2017 12:45:50 +0200 Subject: Re-enable building on 32 bit Windows The issue that prevented us from doing so seems to be fixed. Change-Id: I230419b61352d91e794e5680ca70802d02393bc0 Reviewed-by: Allan Sandfeld Jensen --- mkspecs/features/functions.prf | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'mkspecs/features/functions.prf') diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 8dd21f410..1c77c71f7 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -26,9 +26,6 @@ defineTest(isPlatformSupported) { skipBuild("WinRT is not supported.") return(false) } - isBuildingOnWin32() { - skipBuild("Qt WebEngine on Windows must be built on a 64-bit machine.") - } !isMinWinSDKVersion(10, 10586): { skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.10586 or newer.") return(false) @@ -200,15 +197,6 @@ 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 -- cgit v1.2.3