From 067054150a97c6385b704ce6bac505c4ad1a397f Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 17 May 2017 11:39:43 +0200 Subject: Remove superfluous MSVC version check The MSVC version is already checked by configure.prf. Remove the older, outdated check. This saves us from keeping the version number and error messages in multiple places in sync. Change-Id: I95c4d373771fd57b078b2148b4d8df96778f84ee Reviewed-by: Michal Klocek --- mkspecs/features/functions.prf | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index eb421f8b5..8dd21f410 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -13,18 +13,6 @@ defineTest(isQtMinimum) { } } -defineTest(isMinMSVCVersion) { - actual = $$split(MSVC_VER, .) - actual_major = $$member(actual, 0) - actual_minor = $$member(actual, 1) - requested_major = $$1 - requested_minor = $$2 - lessThan(actual_major, $$requested_major): return(false) - greaterThan(actual_major, $$requested_major): return(true) - lessThan(actual_minor, $$requested_minor): return(false) - return(true) -} - defineTest(isPlatformSupported) { QT_FOR_CONFIG += gui-private linux { @@ -38,15 +26,6 @@ defineTest(isPlatformSupported) { skipBuild("WinRT is not supported.") return(false) } - msvc { - !isMinMSVCVersion(14, 0) { - skipBuild("Qt WebEngine on Windows requires MSVC 2015 Update 2 or later.") - return(false) - } - } else { - skipBuild("Qt WebEngine on Windows requires MSVC 2015 Update 2 or later.") - return(false) - } isBuildingOnWin32() { skipBuild("Qt WebEngine on Windows must be built on a 64-bit machine.") } -- cgit v1.2.3