summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-07-04 14:01:07 +0200
committerMichal Klocek <michal.klocek@qt.io>2017-07-14 15:29:08 +0000
commit6c6173b3b1436e54b22b226e7973d4936db2bfe8 (patch)
tree5249c325fde9a343b7b5258077cabeb98b428736 /mkspecs
parent220015dc7bbab22ecb2afdbf1ce524ffe0aadb2c (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>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/configure.prf4
1 files changed, 4 insertions, 0 deletions
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