summaryrefslogtreecommitdiffstats
path: root/tools/qmake/mkspecs
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-02 17:30:07 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-02 17:30:27 +0100
commitd058d6c9df1ff866e4259ca2989ad144bb01a1e0 (patch)
treed91f8c314c20781080819d100df6a9855b30fbfd /tools/qmake/mkspecs
parent0c6312dfba960365771c64b937579a40e02ea5f7 (diff)
parent3f1805f8569337a21b72324d5edad329d5dfe872 (diff)
Merge remote-tracking branch 'origin/5.8' into 5.9
Diffstat (limited to 'tools/qmake/mkspecs')
-rw-r--r--tools/qmake/mkspecs/features/functions.prf14
1 files changed, 13 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 5e294b96b..b4965129c 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -13,6 +13,18 @@ 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 {
@@ -27,7 +39,7 @@ defineTest(isPlatformSupported) {
return(false)
}
msvc {
- !equals(MSVC_VER, "14.0") {
+ !isMinMSVCVersion(14, 0) {
skipBuild("Qt WebEngine on Windows requires MSVC 2015 Update 2 or later.")
return(false)
}