summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.json1
-rw-r--r--mkspecs/features/configure.prf4
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