diff options
Diffstat (limited to 'mkspecs/features/platform.prf')
| -rw-r--r-- | mkspecs/features/platform.prf | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf index c790c9fa6..35eb6b89c 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -1,5 +1,5 @@ -include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) -QT_FOR_CONFIG += webengine-private +include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) +QT_FOR_CONFIG += webenginecore-private defineTest(isQtMinimum) { !equals(QT_MAJOR_VERSION, $$1): return(false) @@ -29,8 +29,8 @@ defineTest(isPlatformSupported) { skipBuild("Qt WebEngine on Windows requires MSVC.") return(false) } - !isMinWinSDKVersion(10, 10586): { - skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.10586 or newer.") + !isMinWinSDKVersion(10, 16299): { + skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.16299 or newer.") return(false) } !qtConfig(webengine-winversion) { @@ -38,22 +38,23 @@ defineTest(isPlatformSupported) { return(false) } } else:osx { - !isMinXcodeVersion(7, 3) { - skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.") + # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 + !isMinXcodeVersion(8, 3, 3) { + skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") return(false) } !clang|intel_icc { skipBuild("Qt WebEngine on macOS requires Clang.") return(false) } - # We require macOS 10.11 (darwin version 15.0.0) or newer. + # We require macOS 10.12 (darwin version 16.0.0) or newer. darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) - lessThan(darwin_major_version, 15) { - skipBuild("Building Qt WebEngine requires macOS version 10.11 or newer.") + lessThan(darwin_major_version, 16) { + skipBuild("Building Qt WebEngine requires macOS version 10.12 or newer.") return(false) } - !isMinOSXSDKVersion(10, 10): { - skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.11 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") + !isMinOSXSDKVersion(10, 12): { + skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") return(false) } } else { @@ -61,8 +62,9 @@ defineTest(isPlatformSupported) { return(false) } - !contains(QT_CONFIG, c++11) { - skipBuild("C++11 support is required in order to build chromium.") + # QMAKE doesn't set c++14 for MSVC2017, so only test for gcc and clang (which pretends to be gcc) + gcc:!contains(QT_CONFIG, c++14) { + skipBuild("C++14 support is required in order to build chromium.") return(false) } qtConfig(mirclient) { |