diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-09-18 09:52:55 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-09-23 21:47:01 +0300 |
commit | 42e5e8418ed1ad592220285a3270468bcbc617c5 (patch) | |
tree | 9ce5e7a43960dba3214c55ae1ecc3c9c08e6264d /recipes-qt/qt5/qtwebengine | |
parent | a16976979e929618c8fc873b798d78fc82393cab (diff) | |
download | meta-qt5-42e5e8418ed1ad592220285a3270468bcbc617c5.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.14.0 branch.
Task-number: QTBUG-77876
Change-Id: I9e654236787fe17974d90d3dc60a1c551287d77d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch index f464f4a6..0b312809 100644 --- a/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch | |||
@@ -1,23 +1,23 @@ | |||
1 | From 5a1d55ce93a51b35b7c409bcf778a6439ab34906 Mon Sep 17 00:00:00 2001 | 1 | From f8e556db0c49f31881ebefdb2ab28d2b22fccd5c Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Thu, 15 Aug 2019 07:52:53 +0300 | 3 | Date: Thu, 15 Aug 2019 07:52:53 +0300 |
4 | Subject: [PATCH] musl: allow build without glibc | 4 | Subject: [PATCH] musl: allow build without glibc |
5 | 5 | ||
6 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | 6 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> |
7 | --- | 7 | --- |
8 | mkspecs/features/functions.prf | 2 +- | 8 | src/buildtools/config/support.pri | 2 +- |
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf | 11 | diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri |
12 | index a301929..15e7110 100644 | 12 | index 5bdd808..eda498f 100644 |
13 | --- a/mkspecs/features/functions.prf | 13 | --- a/src/buildtools/config/support.pri |
14 | +++ b/mkspecs/features/functions.prf | 14 | +++ b/src/buildtools/config/support.pri |
15 | @@ -167,7 +167,7 @@ defineTest(isWebEngineCoreBuild) { | 15 | @@ -89,7 +89,7 @@ defineTest(qtwebengine_checkErrorForLinux) { |
16 | return(false) | 16 | return(false) |
17 | } | 17 | } |
18 | 18 | ||
19 | - !qtConfig(webengine-system-glibc) { | 19 | - !qtConfig(webengine-system-glibc) { |
20 | + false:!qtConfig(webengine-system-glibc) { | 20 | + false:!qtConfig(webengine-system-glibc) { |
21 | skipBuild("A suitable version >= 2.27 of libc could not be found.") | 21 | qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.") |
22 | return(false) | 22 | return(false) |
23 | } | 23 | } |