summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-01-27 19:44:33 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2020-02-03 13:38:06 +0100
commit239147405e04945e086ce972ff50375bc8259071 (patch)
tree70287bcaaa4bfa91d928a9eb371693a0860d5239 /recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch
parent8cadcbcb52af124417cdc29eb94bf8cdfe86f3d4 (diff)
downloadmeta-qt5-239147405e04945e086ce972ff50375bc8259071.tar.gz
Revert "qtwebkit: remove"
This reverts commit a35403dcf6b75ee7355108cab3e466009003b1a7. But keep the dependency from packagegroup-qt5-toolchain-target, qt5-creator removed as most people won't really need this. Andreas and meta-qt5-extra still need qtwebkit as reported here: https://github.com/meta-qt5/meta-qt5/pull/273#issuecomment-578536852 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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): \