diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-07-04 14:01:07 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2017-07-14 15:29:08 +0000 |
| commit | 6c6173b3b1436e54b22b226e7973d4936db2bfe8 (patch) | |
| tree | 5249c325fde9a343b7b5258077cabeb98b428736 | |
| parent | 220015dc7bbab22ecb2afdbf1ce524ffe0aadb2c (diff) | |
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 <oswald.buddenhagen@qt.io>
Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | configure.json | 1 | ||||
| -rw-r--r-- | mkspecs/features/configure.prf | 4 |
2 files changed, 5 insertions, 0 deletions
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 |