From bdfe27fef0dfa8cec43eb80ee16e0ab5b8189e8c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 4 Jul 2016 10:16:10 +0200 Subject: Allow building WebEngine 5.7 on OS X 10.9 Currently we require a python version greater than or equal to 2.7.6, to build WebEngine. But OS X 10.9 ships with 2.7.5. Lower the version to 2.7.5 to allow building on OS X 10.9. Change-Id: Ibd40d6afecf9ea8a8e4b31115fdf9b6d1368f0e5 Reviewed-by: Kai Koehne --- tools/qmake/mkspecs/features/functions.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/qmake') diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index a5cf5ca77..20fb27817 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -55,7 +55,7 @@ defineTest(isPlatformSupported) { } defineTest(isPythonVersionSupported) { - python_error_msg = "Python version 2 (2.7.6 or later) is required to build Qt WebEngine." + python_error_msg = "Python version 2 (2.7.5 or later) is required to build Qt WebEngine." python_version = $$system('python -c "import sys; print(sys.version_info[0:3])"') python_version ~= s/[()]//g python_version = $$split(python_version, ',') @@ -67,7 +67,7 @@ defineTest(isPythonVersionSupported) { } python_minor_version = $$member(python_version, 1) python_patch_version = $$member(python_version, 2) - greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): greaterThan(python_patch_version, 5): return(true) + greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): greaterThan(python_patch_version, 4): return(true) skipBuild("Using Python version $${python_major_version}.$${python_minor_version}.$${python_patch_version}.") skipBuild($$python_error_msg) return(false) -- cgit v1.2.3