diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-07-19 14:12:54 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-11 17:25:32 +0000 |
| commit | 7282fb4fb4861320539f2b7288f63e1d4f48749d (patch) | |
| tree | 3fb62ed4d45875be975410b08c776888803748ec /mkspecs | |
| parent | 82499104972d24027044acaff1136ea7d758efe2 (diff) | |
Adaptations for Chromium 60
Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/configure.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/functions.prf | 19 |
2 files changed, 16 insertions, 8 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 2264ba704..b270c71f4 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -81,7 +81,10 @@ defineTest(runConfigure) { REQUIRED_PACKAGES = dbus-1 fontconfig !contains(WEBENGINE_CONFIG, embedded_build): qtConfig(xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xtst qtConfig(pulseaudio): REQUIRED_PACKAGES += libpulse - qtConfig(system-png): REQUIRED_PACKAGES += libpng + qtConfig(system-png) { + packagesExist("\'libpng >= 1.6.0\'"): WEBENGINE_CONFIG += use_system_libpng + else: log("System libpng is too old (min. version 1.6). Using Chromium's copy.$${EOL}") + } qtConfig(system-harfbuzz) { packagesExist("\'harfbuzz >= 1.2.0\'"): WEBENGINE_CONFIG += use_system_harfbuzz else: log("System harfbuzz is too old (min. version 1.2). Using Chromium's copy.$${EOL}") diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index b78d2a112..ec3a05488 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -38,26 +38,31 @@ defineTest(isPlatformSupported) { return(false) } } else:osx { - lessThan(QMAKE_XCODE_VERSION, 5.1) { - skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") + lessThan(QMAKE_XCODE_VERSION, 7.3) { + skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.") return(false) } !clang|intel_icc { skipBuild("Qt WebEngine on macOS requires Clang.") return(false) } - # We require OS X 10.0 (darwin version 14.0.0) or newer + # We require macOS 10.11 (darwin version 15.0.0) or newer. darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) - lessThan(darwin_major_version, 14) { - skipBuild("Qt WebEngine requires OS X version 10.10 or newer.") + lessThan(darwin_major_version, 15) { + skipBuild("Building Qt WebEngine requires macOS version 10.11 or newer.") return(false) } !isMinOSXSDKVersion(10, 10): { - skipBuild("Qt WebEngine requires an OS X SDK version of 10.10 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") + skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.11 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") return(false) } } else { - skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and OS X.") + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") + return(false) + } + + cross_compile { + skipBuild("Temporarily disable failing b2qt builds until they are fixed in Coin.") return(false) } |