diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-05-07 10:35:35 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-05-07 13:45:03 +0200 |
| commit | 2b41025fc967b37c8bff77c4b75bab333ae13f46 (patch) | |
| tree | ff6509b9a8a6b15819a5504db41314683449c357 /src/qml/configure.json | |
| parent | adfff7ec77223dfdd8c29327dc0f0181972516ef (diff) | |
Port python check to configure system
Also check for py, python2, python3 executables.
Task-number: QTBUG-72926
Fixes: QTBUG-84038
Pick-to: 5.15
Change-Id: I844db4dd630d9b3025eca529ee57565b600ebbac
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/qml/configure.json')
| -rw-r--r-- | src/qml/configure.json | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/qml/configure.json b/src/qml/configure.json index 3fc1fd528b..944358bc48 100644 --- a/src/qml/configure.json +++ b/src/qml/configure.json @@ -69,6 +69,11 @@ "#endif" ] } + }, + "qml-python": { + "label": "python", + "type": "detectPython", + "log": "location" } }, @@ -185,9 +190,25 @@ "section": "QML", "condition": "features.itemmodel", "output": [ "privateFeature" ] + }, + "qml-python": { + "label": "python", + "condition": "tests.qml-python", + "output": [ + "privateFeature", + { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.qml-python.location" } + ] } }, + "report": [ + { + "type": "error", + "condition": "!features.qml-python", + "message": "Python is required to build QtQml." + } + ], + "summary": [ { "section": "Qt QML", |