summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-01-13 15:40:55 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-01-14 10:02:55 +0200
commit15ce669550e7ee0dae4d16e7cd26d03e7a7a1cf4 (patch)
treeefda9c84b34f6d3f5a37080f0c6398de37bebaef /recipes-qt/qt5/qtdeclarative
parent370845a0acaa28d34800dcb08bf76e0d7aeeadb0 (diff)
parent9ff0a36249205d36bb44cc34a26cb6201180a89f (diff)
downloadmeta-qt5-15ce669550e7ee0dae4d16e7cd26d03e7a7a1cf4.tar.gz
Merge remote-tracking branch 'qt/5.14' into 5.15
NOTE: Qt License agreement update needs more recent Qt modules content from 5.15 branch. Follow-up commit (submodule update) will address the issue. * qt/5.14: 9ff0a362 coin: update poky to 3.1_M1 from master 6776ec35 qtbase, qtwebengine: address issues introduced in latest upstream merge 5b2109a8 Merge remote-tracking branch 'qt/upstream/master' into 5.14 e4e2acba qtbase: Adjust target mkspec settings e8ea2389 qt5: update submodules d8e970eb knx, opcua: update changefiles ca08d8c7 qt5: update submodules f7841daf qt5: update submodules 25039161 qtwebengine: Fix build with 64bit time_t on 32bit architectures 280139a9 qt5: update submodules 4f3ed3ed qtwebkit: add missing flex-native dep 456ec4ac qt5-creator, qtbase: Replace python with python3 f264e5dd qtdeclarative: Ask for python3 explicitly f6ad80f9 qtbase: Fix build on 32bit arches with 64bit time_t b7f4bd20 recipes: Use features_check instead of distro_features_check 1a4ee018 qtwebengine: Fix musl build 02715fff pyqt5: Upgrade to 5.13.2 Conflicts: coin/module_config.yaml recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtcoap_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdatavis3d_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtgamepad_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtknx_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtlottie_git.bb recipes-qt/qt5/qtmqtt_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtnetworkauth_git.bb recipes-qt/qt5/qtopcua_git.bb recipes-qt/qt5/qtpurchasing_git.bb recipes-qt/qt5/qtquick3d_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtscxml_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialbus_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebglplugin_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtwebview_git.bb recipes-qt/qt5/qtx11extras_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I98dab678c9904aef591fe933bf081b3f297e2021
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative')
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch b/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch
new file mode 100644
index 00000000..e1067016
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch
@@ -0,0 +1,60 @@
1From dc94032e6132b41bd6927357e4a57c31436294eb 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 5b94da9b6..0e3496ce8 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 0e63ac2ce..7a30ab64e 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@@ -113,7 +113,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 19551e3ba..bf3f79a45 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.
58--
592.24.0
60