diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-26 16:07:49 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-27 07:38:23 +0200 |
commit | 3bd81f1997683774dd28e6b8673c9b19b66a73ec (patch) | |
tree | 368a37454e3d7031b33a609ef9a428fa43c73880 /recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch | |
parent | 08cc9ad2579f897b84d4fb430d898103dc568d26 (diff) | |
parent | 929b2ef266c6eb4cc1f5500f421fda449cd8900b (diff) | |
download | meta-qt5-3bd81f1997683774dd28e6b8673c9b19b66a73ec.tar.gz |
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: (22 commits)
qtwebengine: add clang fix
qt5: update submodules
qt5: use PACKAGECONFIG to disable tests and examples
qt5: update submodules
qt5: update submodules
qt5: update submodules
qt5: update submodules
ogl-runtime: update to v2.5.0 release
qttools: don't install tst_qtattributionsscanner
qt5: Upgrade to Qt 5.13.2
python(3)-pyqt5: add qml support
libqofono: bump SRCREV and add a fix for voicecall
qt5: update submodules
qt5: update submodules
qtbase: add openssl PACKAGECONFIG for native nativesdk
ogl-runtime: update to 2.5
qtbase: Add PACKAGECONFIG for lttng
layer: Mark zeus as compatible release
ogl-runtime: Fix build on x86_64
README.md: Document need for 32bit host compiler
...
Change-Id: I3892eef7a2ee02cde0f493df7aa1a27f683f1799
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.patch | 6 |
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 e3d3c9bb..c56c68f1 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 @@ | |||
1 | From 7b2e6cae9afa28571ccdc2a9224fb86caa88cd29 Mon Sep 17 00:00:00 2001 | 1 | From 6b5a763cd223ab14bb840738b3871a79d1fb69ea 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, 14 Dec 2017 11:28:10 +0200 | 3 | Date: Thu, 14 Dec 2017 11:28:10 +0200 |
4 | Subject: [PATCH] musl: link against libexecinfo | 4 | Subject: [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 | ||
12 | diff --git a/src/core/core_module.pro b/src/core/core_module.pro | 12 | diff --git a/src/core/core_module.pro b/src/core/core_module.pro |
13 | index 2bfbc65b..7134a5d7 100644 | 13 | index b220af4a..ff54e5d7 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 | @@ -52,7 +52,7 @@ linux { | 16 | @@ -58,7 +58,7 @@ linux { |
17 | POST_TARGETDEPS += $$NINJA_TARGETDEPS | 17 | POST_TARGETDEPS += $$NINJA_TARGETDEPS |
18 | 18 | ||
19 | 19 | ||