forked from mirrors/nixpkgs
51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
|
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
|
||
|
|
--- a/mkspecs/features/configure.prf
|
||
|
|
+++ b/mkspecs/features/configure.prf
|
||
|
|
@@ -194,9 +194,6 @@ defineTest(runConfigure) {
|
||
|
|
} else {
|
||
|
|
log("Native Spellchecker .............. Not enabled (Default, enable with WEBENGINE_CONFIG+=use_native_spellchecker)$${EOL}")
|
||
|
|
}
|
||
|
|
- !isMinOSXSDKVersion(10, 10, 3) {
|
||
|
|
- log(" Force Touch API usage .............. Not enabled (Because the OS X SDK version to be used \"$${WEBENGINE_OSX_SDK_PRODUCT_VERSION}\" is lower than the required \"10.10.3\")$${EOL}")
|
||
|
|
- }
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
|
||
|
|
--- a/mkspecs/features/functions.prf
|
||
|
|
+++ b/mkspecs/features/functions.prf
|
||
|
|
@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) {
|
||
|
|
return(false)
|
||
|
|
}
|
||
|
|
} else:osx {
|
||
|
|
- !isMinXcodeVersion(5, 1) {
|
||
|
|
- skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.")
|
||
|
|
- return(false)
|
||
|
|
- }
|
||
|
|
!clang|intel_icc {
|
||
|
|
skipBuild("Qt WebEngine on macOS requires Clang.")
|
||
|
|
return(false)
|
||
|
|
@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) {
|
||
|
|
skipBuild("Qt WebEngine requires OS X version 10.10 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}.")
|
||
|
|
- return(false)
|
||
|
|
- }
|
||
|
|
} else {
|
||
|
|
skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and OS X.")
|
||
|
|
return(false)
|
||
|
|
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
|
||
|
|
--- a/src/core/config/mac_osx.pri
|
||
|
|
+++ b/src/core/config/mac_osx.pri
|
||
|
|
@@ -5,8 +5,6 @@ load(functions)
|
||
|
|
# otherwise query for it.
|
||
|
|
QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
|
||
|
|
isEmpty(QMAKE_MAC_SDK_VERSION) {
|
||
|
|
- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null")
|
||
|
|
- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
|
||
|
|
}
|
||
|
|
|
||
|
|
QMAKE_CLANG_DIR = "/usr"
|