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/3rdparty | |
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/3rdparty')
-rw-r--r-- | src/3rdparty/masm/masm.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index 1df4585aae..9a12e65eeb 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) { udis86.output = udis86_itab.h udis86.input = ITAB udis86.CONFIG += no_link - udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} + udis86.commands = $QMAKE_PYTHON $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} QMAKE_EXTRA_COMPILERS += udis86 udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c @@ -111,7 +111,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h retgen.script = $$PWD/yarr/create_regex_tables retgen.input = retgen.script retgen.CONFIG += no_link -retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} +retgen.commands = $$QMAKE_PYTHON $$retgen.script > ${QMAKE_FILE_OUT} QMAKE_EXTRA_COMPILERS += retgen # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf |