From 8cac7eb564232657167bc288ce807f4235cead46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Mon, 19 Jan 2015 13:52:55 +0100 Subject: Check for python version 2, minor version 7 and up when building. Python 3 is not supported by the Chromium build system and installation of the Qt WebEngine libraries will fail. Change-Id: Ie402c069afecf087de8521401ed4261e74df8b87 Task-number: QTBUG-43242 Reviewed-by: Andras Becsi --- tools/qmake/mkspecs/features/functions.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 570ee971d..2470295ed 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -24,8 +24,8 @@ defineTest(isPlatformSupported) { defineTest(isPythonVersionSupported) { python_major_version = $$system('python -c "import sys; print sys.version_info.major"') python_minor_version = $$system('python -c "import sys; print sys.version_info.minor"') - greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): return(true) - skipBuild("Using Python version "$$python_major_version"."$$python_minor_version", but at least Python version 2.7 is required to build Qt WebEngine.") + lessThan(python_major_version, 3): greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): return(true) + skipBuild("Using Python version "$$python_major_version"."$$python_minor_version", but Python version 2 (2.7 or later) is required to build Qt WebEngine.") return(false) } -- cgit v1.2.3