diff options
| author | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-01-19 13:52:55 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-01-20 13:47:37 +0100 |
| commit | 8cac7eb564232657167bc288ce807f4235cead46 (patch) | |
| tree | c7a109e779bce9400c6b8cd51e51233eb886307d | |
| parent | cdb44933487401fc7487c888d3033dee8985042b (diff) | |
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 <andras.becsi@theqtcompany.com>
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 4 |
1 files 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) } |