summaryrefslogtreecommitdiffstats
diff options
-rw-r--r--configure.pri2
-rw-r--r--mkspecs/features/functions.prf6
-rw-r--r--src/buildtools/configure.json8
3 files changed, 8 insertions, 8 deletions
diff --git a/configure.pri b/configure.pri
index 99cdbf72b..cb53c93b0 100644
--- a/configure.pri
+++ b/configure.pri
@@ -49,7 +49,7 @@ defineTest(qtConfReport_jumboBuild) {
qtConfReportPadded($${1}, $$mergeLimit)
}
-defineTest(qtConfTest_detectPython) {
+defineTest(qtConfTest_detectPython2) {
pythonOverride = $$eval(config.input.python_override)
!isEmpty(pythonOverride) {
python = $$qtConfFindInPath("$$pythonOverride$$EXE_SUFFIX")
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index 65500776b..7f630588a 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
@@ -44,11 +44,11 @@ defineReplace(which) {
# Returns the unquoted path to the python executable.
defineReplace(pythonPath) {
- isEmpty(QMAKE_PYTHON) {
+ isEmpty(QMAKE_PYTHON2) {
# Fallback for building QtWebEngine with Qt < 5.8
- QMAKE_PYTHON = python
+ QMAKE_PYTHON2 = python
}
- return($$QMAKE_PYTHON)
+ return($$QMAKE_PYTHON2)
}
# Returns the python executable for use with shell / make targets.
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index 17fc65106..5e5d9d725 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -318,8 +318,8 @@
"type": "detectNinja"
},
"webengine-python": {
- "label": "python",
- "type": "detectPython",
+ "label": "python2",
+ "type": "detectPython2",
"log": "location"
},
"webengine-winversion": {
@@ -446,11 +446,11 @@
"output": [ "privateFeature" ]
},
"webengine-python": {
- "label": "python",
+ "label": "python2",
"condition": "tests.webengine-python",
"output": [
"privateFeature",
- { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" }
+ { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python.location" }
]
},
"webengine-gperf": {