From 6c6173b3b1436e54b22b226e7973d4936db2bfe8 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 4 Jul 2017 14:01:07 +0200 Subject: Add python check for module build Python version check skipped the build only for qt5 root builds, however for module build it only printed the warning and the build continued. Skip the build if python version is incorrect. Change-Id: I72d5f638eb79de93faaaa07b39272bdcb8615c3f Reviewed-by: Oswald Buddenhagen Reviewed-by: Viktor Engelmann Reviewed-by: Kai Koehne --- configure.json | 1 + mkspecs/features/configure.prf | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/configure.json b/configure.json index 69d261a00..c4d00ffcc 100644 --- a/configure.json +++ b/configure.json @@ -98,6 +98,7 @@ "label": "Python 2", "condition": "tests.python2", "output": [ + "privateFeature", { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.python2.location" } ] }, diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 6de9efe93..48a2f0f96 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -36,6 +36,10 @@ defineTest(runConfigure) { skipBuild("Required flex could not be found.") return(false) } + !qtConfig(python2) { + skipBuild("A suitable version of python2 could not be found.") + return(false) + } qtConfig(pepper-plugins): WEBENGINE_CONFIG += use_pepper_plugins qtConfig(printing-and-pdf): WEBENGINE_CONFIG += use_printing use_pdf -- cgit v1.2.3