summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-05-28 11:53:32 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-06-01 09:39:49 +0300
commitc46b743fd1867e3ad4ecae3b016413fa4e534fd0 (patch)
tree2d256cd063ed098d1d0e3562e5f76dcd38ecd928 /recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
parent8b4a01436c10cfd79db28f6462f0769dc7de0539 (diff)
downloadmeta-qt5-c46b743fd1867e3ad4ecae3b016413fa4e534fd0.tar.gz
qt5: update submodules
Update to latest content in Qt 5.15 branch. Notes: - qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch included in qtbase - qtdeclarative/0002-Use-python3-explicitly.patch removed due QTBUG-84038 Task-number: QTBUG-84150 Change-Id: I183d3d9ed73febd09407ab241af88f707473bca0 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch')
-rw-r--r--recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch b/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
deleted file mode 100644
index f55812b6..00000000
--- a/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 838fb4676f78d169dc88f87544cf1a4003302aea Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 26 Nov 2019 21:10:03 -0800
4Subject: [PATCH] Use python3 explicitly
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 qtdeclarative.pro | 2 +-
9 src/3rdparty/masm/masm.pri | 4 ++--
10 tests/auto/qml/ecmascripttests/test262.py | 2 +-
11 3 files changed, 4 insertions(+), 4 deletions(-)
12
13diff --git a/qtdeclarative.pro b/qtdeclarative.pro
14index 5b94da9b69..0e3496ce80 100644
15--- a/qtdeclarative.pro
16+++ b/qtdeclarative.pro
17@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
18 load(qt_parts)
19
20 !python_available {
21- py_out = $$system('python -c "print(1)"')
22+ py_out = $$system('python3 -c "print(1)"')
23 !equals(py_out, 1): error("Building QtQml requires Python.")
24 tmp = python_available
25 CONFIG += $$tmp
26diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
27index 1df4585aae..00038104ec 100644
28--- a/src/3rdparty/masm/masm.pri
29+++ b/src/3rdparty/masm/masm.pri
30@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
31 udis86.output = udis86_itab.h
32 udis86.input = ITAB
33 udis86.CONFIG += no_link
34- udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
35+ udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
36 QMAKE_EXTRA_COMPILERS += udis86
37
38 udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
39@@ -111,7 +111,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
40 retgen.script = $$PWD/yarr/create_regex_tables
41 retgen.input = retgen.script
42 retgen.CONFIG += no_link
43-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
44+retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT}
45 QMAKE_EXTRA_COMPILERS += retgen
46
47 # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
48diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py
49index 19551e3ba2..bf3f79a45f 100755
50--- a/tests/auto/qml/ecmascripttests/test262.py
51+++ b/tests/auto/qml/ecmascripttests/test262.py
52@@ -1,4 +1,4 @@
53-#!/usr/bin/env python
54+#!/usr/bin/env python3
55 #############################################################################
56 ##
57 ## Copyright (C) 2017 The Qt Company Ltd.