From 29b4aa9dda40ac3761c856093bf8e27f7e4b2d15 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 29 Feb 2016 11:49:59 +0100 Subject: Skip building on 32-bit windows hosts We keep running out of memory during linking and must skip building on 32-bit architectures until that problem is solved. Change-Id: Ib0b465cb033df0112133eb256adeb498d260da7f Reviewed-by: Kai Koehne --- src/core/config/windows.pri | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index f2742861b..72de7055c 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -69,11 +69,7 @@ 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\"" + isBuildingOnWin32(): 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") -- cgit v1.2.3