diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-12 20:44:47 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-13 12:38:02 +0200 |
commit | 6776ec35cf9b31a2fac8057f540d65ea09373a7f (patch) | |
tree | 970998705de25c309b25c220e1c70014f41b691d /recipes-qt/qt5/qtwebengine | |
parent | 5b2109a88ee8e8a769190e640661434d98b62548 (diff) | |
download | meta-qt5-6776ec35cf9b31a2fac8057f540d65ea09373a7f.tar.gz |
qtbase, qtwebengine: address issues introduced in latest upstream merge
* Replace faulty qtbase patch "0018-input-Make-use-of-timeval-portable-
for-64bit-time_t.patch" with fixed version
* Remove obsolete webengine patch "0004-mkspecs-Allow-builds-with-libc-
glibc.patch"
Change-Id: I02ecbb09a04313b0f68bce8083b5c0a6e0b0c035
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch deleted file mode 100644 index 73ef469f..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From a5c8d833ffb8b54626b7b670b2782a6cf9a45075 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 12 Nov 2019 19:53:59 -0800 | ||
4 | Subject: [PATCH] mkspecs: Allow builds with libc != glibc | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | mkspecs/features/configure.prf | 5 ----- | ||
9 | 1 file changed, 5 deletions(-) | ||
10 | |||
11 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | ||
12 | index cc84182b..c278ffae 100644 | ||
13 | --- a/mkspecs/features/configure.prf | ||
14 | +++ b/mkspecs/features/configure.prf | ||
15 | @@ -75,11 +75,6 @@ defineTest(runConfigure) { | ||
16 | return(false) | ||
17 | } | ||
18 | |||
19 | - !qtConfig(webengine-system-glibc) { | ||
20 | - skipBuild("A suitable version >= 2.27 of libc could not be found.") | ||
21 | - return(false) | ||
22 | - } | ||
23 | - | ||
24 | QT_FOR_CONFIG += gui-private | ||
25 | |||
26 | !qtConfig(webengine-system-khr) { | ||
27 | -- | ||
28 | 2.24.0 | ||
29 | |||