summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2017-06-16 12:45:50 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-06-18 07:57:36 +0000
commit53b632ee0b6dc92ffc4f94f88755d94f7533637a (patch)
tree709b079be53b7725fc8ec37f3ae59966b96997bf /mkspecs
parent1eed5a436c4e9754d922f5ff6e4e4791a3fec27c (diff)
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 <allan.jensen@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/functions.prf12
1 files changed, 0 insertions, 12 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index 8dd21f41..1c77c71f 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