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/qml.pro | |
| 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/qml.pro')
| -rw-r--r-- | src/qml/qml.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro index 7bb3547ee9..14b46307aa 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -7,6 +7,9 @@ qtConfig(qml-network): \ TRACEPOINT_PROVIDER = $$PWD/qtqml.tracepoints CONFIG += qt_tracepoints +!qtConfig(qml-python): \ + error(Python is required to build QtQml.) + DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x66000000 @@ -63,7 +66,6 @@ qtConfig(qml-animation) { } include(types/types.pri) include(../3rdparty/masm/masm-defs.pri) -include(../3rdparty/masm/masm.pri) MODULE_PLUGIN_TYPES = \ qmltooling @@ -75,3 +77,5 @@ QML_IMPORT_VERSION = $$QT_VERSION CONFIG += qmltypes install_qmltypes install_metatypes load(qt_module) + +include(../3rdparty/masm/masm.pri) |