summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2017-05-17 11:39:43 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-05-23 03:34:53 +0000
commit067054150a97c6385b704ce6bac505c4ad1a397f (patch)
treedfdd139b844f8f2ded1a20aa8075e726d2e9f1d8 /mkspecs
parent6d1d6bdd85a014fb56f8616edc91677ffbb126f5 (diff)
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 <michal.klocek@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/functions.prf21
1 files changed, 0 insertions, 21 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index eb421f8b..8dd21f41 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.")
}