diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-22 10:26:45 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-25 09:19:26 +0200 |
| commit | 929b2ef266c6eb4cc1f5500f421fda449cd8900b (patch) | |
| tree | 2df07f423983f7ef00c1c4c817b37416b25553ae /recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch | |
| parent | fd86202d56c542011d24dc518457631bc00901c9 (diff) | |
| parent | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (diff) | |
| download | meta-qt5-929b2ef266c6eb4cc1f5500f421fda449cd8900b.tar.gz | |
Merge remote-tracking branch 'qtyocto/5.13' into 5.14
* origin/5.13:
12cc756 Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.13
432ad2a qttools: don't install tst_qtattributionsscanner
8115617 qt5: Upgrade to Qt 5.13.2
267e646 python(3)-pyqt5: add qml support
653e12f libqofono: bump SRCREV and add a fix for voicecall
cefb48e qtbase: Add PACKAGECONFIG for lttng
911b346 layer: Mark zeus as compatible release
c373272 ogl-runtime: Fix build on x86_64
9172ba1 README.md: Document need for 32bit host compiler
db2fd6c qtwayland: Fix build with clang/libc++
6b5122e qtbase: Fix build when fp16 is used
Conflicts:
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
Change-Id: I475f15bad150bbc86ed49c1c0807fe0948e60723
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 | ||