Commits
Marcus Calhoun-Lopez authored 37a0b34e979
1 + | --- tools/qmake/mkspecs/features/functions.prf.orig 2018-10-20 09:02:12.000000000 -0700 |
2 + | +++ tools/qmake/mkspecs/features/functions.prf 2018-10-20 09:05:57.000000000 -0700 |
3 + | |
4 + | skipBuild("Static builds of QtWebEngine aren't supported.") |
5 + | return(false) |
6 + | } |
7 + | - osx:lessThan(QMAKE_XCODE_VERSION, 5.1) { |
8 + | + osx:!isMinXcodeVersion(6, 1) { |
9 + | skipBuild("Using xcode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") |
10 + | return(false) |
11 + | } |
12 + | |
13 + | return(false) |
14 + | } |
15 + | |
16 + | +defineTest(isMinXcodeVersion) { |
17 + | + requested_major = $$1 |
18 + | + requested_minor = $$2 |
19 + | + requested_patch = $$3 |
20 + | + isEmpty(requested_minor): requested_minor = 0 |
21 + | + isEmpty(requested_patch): requested_patch = 0 |
22 + | + target_var = QMAKE_XCODE_VERSION |
23 + | + major_version = $$section($$target_var, ., 0, 0) |
24 + | + minor_version = $$section($$target_var, ., 1, 1) |
25 + | + patch_version = $$section($$target_var, ., 2, 2) |
26 + | + isEmpty(minor_version): minor_version = 0 |
27 + | + isEmpty(patch_version): patch_version = 0 |
28 + | + |
29 + | + greaterThan(major_version, $$requested_major):return(true) |
30 + | + equals(major_version, $$requested_major):greaterThan(minor_version, $$requested_minor):return(true) |
31 + | + equals(major_version, $$requested_major):equals(minor_version, $$requested_minor):!lessThan(patch_version, $$requested_patch):return(true) |
32 + | + |
33 + | + return(false) |
34 + | +} |
35 + | + |
36 + | defineTest(isGCCVersionSupported) { |
37 + | # The below will work for gcc 4.7 and up and also match gcc 5 |
38 + | greaterThan(QT_GCC_MINOR_VERSION, 6):return(true) |