summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2018-10-02 14:33:10 +0300
committerJani Heikkinen <jani.heikkinen@qt.io>2018-10-02 14:33:51 +0300
commitbd274cc86dfc1d3ec6ace444f4b781589d45b75d (patch)
treeac2d7280b057d0dd2c8f81dfc5fc67f1f95bdfb5
parent25a69979e769ec17aa5f89c6d89cfd0a56e831f0 (diff)
parent9bc7fd3ad241daf464fe065667ded711fdaee160 (diff)
Merge remote-tracking branch 'origin/5.9' into 5.9.7
-rw-r--r--mkspecs/features/functions.prf22
1 files changed, 21 insertions, 1 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index b78d2a112..ac0c98374 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
@@ -38,7 +38,7 @@ defineTest(isPlatformSupported) {
return(false)
}
} else:osx {
- lessThan(QMAKE_XCODE_VERSION, 5.1) {
+ !isMinXcodeVersion(5, 1) {
skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.")
return(false)
}
@@ -241,6 +241,26 @@ defineTest(isMinOSXSDKVersion) {
return(false)
}
+defineTest(isMinXcodeVersion) {
+ requested_major = $$1
+ requested_minor = $$2
+ requested_patch = $$3
+ isEmpty(requested_minor): requested_minor = 0
+ isEmpty(requested_patch): requested_patch = 0
+ target_var = QMAKE_XCODE_VERSION
+ major_version = $$section($$target_var, ., 0, 0)
+ minor_version = $$section($$target_var, ., 1, 1)
+ patch_version = $$section($$target_var, ., 2, 2)
+ isEmpty(minor_version): minor_version = 0
+ isEmpty(patch_version): patch_version = 0
+
+ greaterThan(major_version, $$requested_major):return(true)
+ equals(major_version, $$requested_major):greaterThan(minor_version, $$requested_minor):return(true)
+ equals(major_version, $$requested_major):equals(minor_version, $$requested_minor):!lessThan(patch_version, $$requested_patch):return(true)
+
+ return(false)
+}
+
defineTest(isMinWinSDKVersion) {
requested_major = $$1
requested_minor = $$2