diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/configure.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/functions.prf | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index c1e919603..f7a38ac12 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -133,10 +133,6 @@ defineTest(runConfigure) { cache(WEBENGINE_CONFIG, add, $$list($$WEBENGINE_CONFIG)) export(WEBENGINE_CONFIG) } - # Set a global WEBENGINE_ARCH for the target architecture we can also read from option(host_build) - WEBENGINE_ARCH = $$QT_ARCH - cache(WEBENGINE_ARCH) - export(WEBENGINE_ARCH) } unix:!darwin { diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 8dd21f410..56894e58a 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -16,7 +16,7 @@ defineTest(isQtMinimum) { defineTest(isPlatformSupported) { QT_FOR_CONFIG += gui-private linux { - !gcc:!clang { + if(!gcc:!clang)|intel_icc { skipBuild("Qt WebEngine on Linux requires clang or GCC.") return(false) } @@ -29,6 +29,10 @@ defineTest(isPlatformSupported) { 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) + } !isMinWinSDKVersion(10, 10586): { skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.10586 or newer.") return(false) @@ -38,6 +42,10 @@ defineTest(isPlatformSupported) { skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") return(false) } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") + return(false) + } # We require OS X 10.0 (darwin version 14.0.0) or newer darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) lessThan(darwin_major_version, 14) { |