summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch
diff options
context:
space:
mode:
authorChenxi Mao <parheliamm@126.com>2020-04-10 08:46:18 +0800
committerChenxi Mao <parheliamm@126.com>2020-04-11 15:21:38 +0800
commitdd2fd47dc0acdf90f73a639149aa59269a72f9cb (patch)
tree84a26d65e6cb33040db0b77b79177f4801696f9d /recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch
parent84278d09aef9f917dd695df8c424c5d61395bdf3 (diff)
downloadmeta-qt5-dd2fd47dc0acdf90f73a639149aa59269a72f9cb.tar.gz
QTWebKit: Fix build error on QT-5.15 branch
There are 2 changes to build QtWebkit on QT-5.15 1. Move SHA1 to QTwebkit tag QtWebKit 5.212.0 Alpha 4 SHA1: 444bd2bda5fa46c2b4b99adaf6e9b2074b03a0d1 2. Remove python3 patch. Fixes: QTBUG-83426 Change-Id: I6a1f1d8a29c828e28e3c8192c1b863a85991080e Reviewed-by: Chenxi Mao <chenxi.mao2013@gmail.com> Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch')
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch
new file mode 100644
index 00000000..a237d03d
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch
@@ -0,0 +1,28 @@
1From 34018c2a61045c58f88e09a12ecd62533aa2c2f1 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Mon, 4 Jun 2018 10:35:46 +0200
4Subject: [PATCH] Do not skip build for cross-compile
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Inappropriate [OE specific]
10
11Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
12---
13 Tools/qmake/mkspecs/features/functions.prf | 2 --
14 1 file changed, 2 deletions(-)
15
16diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf
17index e3f42cec4..797b7085f 100644
18--- a/Tools/qmake/mkspecs/features/functions.prf
19+++ b/Tools/qmake/mkspecs/features/functions.prf
20@@ -53,8 +53,6 @@ defineReplace(appleSdkVersion) {
21 defineTest(isPlatformSupported) {
22 !qtHaveModule(widgets): skipBuild("QtWidgets module is required to build QtWebKit.")
23
24- cross_compile: skipBuild("cross-compilation of QtWebKit with qmake is not supported yet")
25-
26 requiredPrograms = cmake gperf python perl bison ruby flex
27 for(program, requiredPrograms): \
28 !programExistsInPath($$program): \