summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-08-14 15:06:28 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-08-15 10:10:47 +0300
commit63dec9bbd826a4afafa7177aaa3439467f25d80a (patch)
treeafcff4f6d8c72cb4a51f1e27cda2a65aeb55d712 /recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
parent79791026ff20539180027de0d796f8acd55bc7bf (diff)
parent53500ade778bac6e1733db43fc41c290d7b9d16b (diff)
downloadmeta-qt5-63dec9bbd826a4afafa7177aaa3439467f25d80a.tar.gz
Merge remote-tracking branch 'origin/upstream/master' into 5.13
* origin/upstream/master: qtdeclarative: Use qmlcachegen provided by OE instead of system one. qtbase-native: Always use qt provided doubleconversion library. qttools: Enable clang support when using clang qt5-creator: update to v4.9.2 maliit-framework-qt5: Fix build when ptest is enabled qtwebengine: Fix build on aarch64 qtwebengine: refresh the patches to apply qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc qt5: Upgrade to Qt 5.13.0 Allow enabling gui for native and nativesdk qt5everywheredemo: update HOMEPAGE qtconnectivity,qtsystems: Account for bluez4 from oe-core gdb_%.bbappend: Avoid PAK archive (application/x-pak) Change-Id: I24e0b7b95920df3722f84a1f3a2e74546dc74810
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
index 6dc7f0cb..e3d3c9bb 100644
--- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
@@ -1,4 +1,4 @@
1From 983ba7f8f80165ade5347544f1e975bd6b67549e Mon Sep 17 00:00:00 2001 1From 7b2e6cae9afa28571ccdc2a9224fb86caa88cd29 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 14 Dec 2017 11:28:10 +0200 3Date: Thu, 14 Dec 2017 11:28:10 +0200
4Subject: [PATCH] musl: link against libexecinfo 4Subject: [PATCH] musl: link against libexecinfo
@@ -10,10 +10,10 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/src/core/core_module.pro b/src/core/core_module.pro 12diff --git a/src/core/core_module.pro b/src/core/core_module.pro
13index 3b5d37f2..0882d5fd 100644 13index 2bfbc65b..7134a5d7 100644
14--- a/src/core/core_module.pro 14--- a/src/core/core_module.pro
15+++ b/src/core/core_module.pro 15+++ b/src/core/core_module.pro
16@@ -51,7 +51,7 @@ linux { 16@@ -52,7 +52,7 @@ linux {
17 POST_TARGETDEPS += $$NINJA_TARGETDEPS 17 POST_TARGETDEPS += $$NINJA_TARGETDEPS
18 18
19 19