diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-14 08:37:18 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:34:49 +0000 |
commit | f9e80edff01159375b6e03f3cb9ea1f8ed5ced79 (patch) | |
tree | ada273f12808c8c1ed9e4585638c63d93d8363a4 /recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch | |
parent | 3e7da25564d74195610adede9391ca733a0a1412 (diff) | |
download | meta-qt5-f9e80edff01159375b6e03f3cb9ea1f8ed5ced79.tar.gz |
qt5: update to latest revision in 5.11 branch
* drop nobranch=1 again
* update the branches and tags on meta-qt5/qt* forks and the tag name
in recipes
* use latest revision in 5.11 branch instead of 5.11.2 which might be
removed again
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.patch | 5 |
1 files changed, 1 insertions, 4 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 index dac4815c..4b2b2759 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From d9f4d11ffdf1e8b5485aefc3556b1bef3e009587 Mon Sep 17 00:00:00 2001 | 1 | From 1a4e33ac630b0e4f285e238479900f0e10c6d15f Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
3 | Date: Mon, 4 Jun 2018 10:35:46 +0200 | 3 | Date: Mon, 4 Jun 2018 10:35:46 +0200 |
4 | Subject: [PATCH] Do not skip build for cross-compile | 4 | Subject: [PATCH] Do not skip build for cross-compile |
@@ -26,6 +26,3 @@ index e3f42cec4..797b7085f 100644 | |||
26 | requiredPrograms = cmake gperf python perl bison ruby flex | 26 | requiredPrograms = cmake gperf python perl bison ruby flex |
27 | for(program, requiredPrograms): \ | 27 | for(program, requiredPrograms): \ |
28 | !programExistsInPath($$program): \ | 28 | !programExistsInPath($$program): \ |
29 | -- | ||
30 | 2.14.3 | ||
31 | |||