[qtdeclarative] Use python3. Contributes to JB#50718

sailfishos · Oct 15, 2020 · 4cc349a · 4cc349a
1 parent 77ee6a2
commit 4cc349a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/qtdeclarative.pro b/qtdeclarative.pro
@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
 load(qt_parts)
 
 !python_available {
-    py_out = $$system('python -c "print(1)"')
+    py_out = $$system('python3 -c "print(1)"')
     !equals(py_out, 1): error("Building QtQml requires Python.")
     tmp = python_available
     CONFIG += $$tmp

diff --git a/rpm/qtdeclarative.spec b/rpm/qtdeclarative.spec
@@ -13,7 +13,7 @@ BuildRequires:  qt5-qttest-devel
 BuildRequires:  qt5-qtxmlpatterns-devel
 BuildRequires:  qt5-qmake
 BuildRequires:  fdupes
-BuildRequires:  python
+BuildRequires:  python3-base
 BuildRequires:  gdb
 BuildRequires:  qml-rpm-macros
 Obsoletes: qt5-qtjsbackend <= 5.1.0+git4

diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
@@ -47,7 +47,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 = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
     QMAKE_EXTRA_COMPILERS += udis86
 
     udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
@@ -83,7 +83,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
 retgen.script = $$PWD/create_regex_tables
 retgen.input = retgen.script
 retgen.CONFIG += no_link
-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
+retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT}
 QMAKE_EXTRA_COMPILERS += retgen
 
 # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf

diff --git a/tests/manual/v4/tests.pro b/tests/manual/v4/tests.pro
@@ -4,12 +4,12 @@ TESTSCRIPT=$$PWD/test262.py
 V4CMD = qmljs
 
 checktarget.target = check
-checktarget.commands = python $$TESTSCRIPT --command=$$V4CMD --parallel --with-test-expectations --update-expectations
+checktarget.commands = python3 $$TESTSCRIPT --command=$$V4CMD --parallel --with-test-expectations --update-expectations
 checktarget.depends = all
 QMAKE_EXTRA_TARGETS += checktarget
 
 checkmothtarget.target = check-interpreter
-checkmothtarget.commands = python $$TESTSCRIPT --command=\"$$V4CMD --interpret\" --parallel --with-test-expectations
+checkmothtarget.commands = python3 $$TESTSCRIPT --command=\"$$V4CMD --interpret\" --parallel --with-test-expectations
 checkmothtarget.depends = all
 QMAKE_EXTRA_TARGETS += checkmothtarget