summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative')
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch (renamed from recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch)13
2 files changed, 6 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch b/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch
index 262ad95e..60922e74 100644
--- a/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch
+++ b/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch
@@ -1,4 +1,4 @@
1From 2ca54b2296463f626f8438825907610cb22169fc Mon Sep 17 00:00:00 2001 1From d39e76b9662ea9cf236ac59749855e7da7ad29a8 Mon Sep 17 00:00:00 2001
2From: Piotr Tworek <tworaz@tworaz.net> 2From: Piotr Tworek <tworaz@tworaz.net>
3Date: Wed, 3 Jul 2019 01:13:40 +0200 3Date: Wed, 3 Jul 2019 01:13:40 +0200
4Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to locate qmlcachegen 4Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to locate qmlcachegen
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch b/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
index e1067016..f55812b6 100644
--- a/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch
+++ b/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
@@ -1,4 +1,4 @@
1From dc94032e6132b41bd6927357e4a57c31436294eb Mon Sep 17 00:00:00 2001 1From 838fb4676f78d169dc88f87544cf1a4003302aea Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 26 Nov 2019 21:10:03 -0800 3Date: Tue, 26 Nov 2019 21:10:03 -0800
4Subject: [PATCH] Use python3 explicitly 4Subject: [PATCH] Use python3 explicitly
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 3 files changed, 4 insertions(+), 4 deletions(-) 11 3 files changed, 4 insertions(+), 4 deletions(-)
12 12
13diff --git a/qtdeclarative.pro b/qtdeclarative.pro 13diff --git a/qtdeclarative.pro b/qtdeclarative.pro
14index 5b94da9b6..0e3496ce8 100644 14index 5b94da9b69..0e3496ce80 100644
15--- a/qtdeclarative.pro 15--- a/qtdeclarative.pro
16+++ b/qtdeclarative.pro 16+++ b/qtdeclarative.pro
17@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools 17@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
@@ -24,7 +24,7 @@ index 5b94da9b6..0e3496ce8 100644
24 tmp = python_available 24 tmp = python_available
25 CONFIG += $$tmp 25 CONFIG += $$tmp
26diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri 26diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
27index 0e63ac2ce..7a30ab64e 100644 27index 1df4585aae..00038104ec 100644
28--- a/src/3rdparty/masm/masm.pri 28--- a/src/3rdparty/masm/masm.pri
29+++ b/src/3rdparty/masm/masm.pri 29+++ b/src/3rdparty/masm/masm.pri
30@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) { 30@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
@@ -36,7 +36,7 @@ index 0e63ac2ce..7a30ab64e 100644
36 QMAKE_EXTRA_COMPILERS += udis86 36 QMAKE_EXTRA_COMPILERS += udis86
37 37
38 udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c 38 udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
39@@ -113,7 +113,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h 39@@ -111,7 +111,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
40 retgen.script = $$PWD/yarr/create_regex_tables 40 retgen.script = $$PWD/yarr/create_regex_tables
41 retgen.input = retgen.script 41 retgen.input = retgen.script
42 retgen.CONFIG += no_link 42 retgen.CONFIG += no_link
@@ -46,7 +46,7 @@ index 0e63ac2ce..7a30ab64e 100644
46 46
47 # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf 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 48diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py
49index 19551e3ba..bf3f79a45 100755 49index 19551e3ba2..bf3f79a45f 100755
50--- a/tests/auto/qml/ecmascripttests/test262.py 50--- a/tests/auto/qml/ecmascripttests/test262.py
51+++ b/tests/auto/qml/ecmascripttests/test262.py 51+++ b/tests/auto/qml/ecmascripttests/test262.py
52@@ -1,4 +1,4 @@ 52@@ -1,4 +1,4 @@
@@ -55,6 +55,3 @@ index 19551e3ba..bf3f79a45 100755
55 ############################################################################# 55 #############################################################################
56 ## 56 ##
57 ## Copyright (C) 2017 The Qt Company Ltd. 57 ## Copyright (C) 2017 The Qt Company Ltd.
58--
592.24.0
60