diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-06-21 17:11:31 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-23 06:29:25 +0000 |
| commit | d5de0e97e6318bf17a3dac027c299b7f202f2e58 (patch) | |
| tree | b9da21f0cfd87769c2d1febfd5f7a03b7ea948db | |
| parent | 55a5420173b6ab10611eb91386b54217b8218ba0 (diff) | |
Revert "Re-enable building on 32 bit Windows"
Turns out that we still run out of memory when linking on a 32 bit
Windows.
This reverts commit 53b632ee0b6dc92ffc4f94f88755d94f7533637a.
Change-Id: Ifd8319927b816a52664f214a2540bad31f67935a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | mkspecs/features/functions.prf | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 1c77c71f7..8dd21f410 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.") + } !isMinWinSDKVersion(10, 10586): { skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.10586 or newer.") return(false) @@ -197,6 +200,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 |