diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-23 10:28:00 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-23 10:34:18 +0300 |
| commit | baf9b8e6918c76d7f58d557d9a102b5b5d1727c0 (patch) | |
| tree | 9cbaaa54acd3ce1d0cc52b7a9045240723f8b9da /recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |
| parent | 89ac66bf3969b48eb771ef4c06a0b8df00fd178a (diff) | |
| parent | 60e61ea26a0f221fdb8c992990686c9f449f27c5 (diff) | |
| download | meta-qt5-baf9b8e6918c76d7f58d557d9a102b5b5d1727c0.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
* qtocto/upstream/warrior:
60e61ea qt3d-runtime: update to v2.3
cad5f8c qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
44aab3a qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
000e298 qtbase: add libxext dependency for xcb PACKAGECONFIG
ba08444 python-pyqt5: Update to version 5.12.1.
6a1a387 python-pyqt: Fix annoying problems.
c7e0ba5 qtwebengine: arm: use OE specified -mcpu option
9c62c01 qtbase-tools: Fix error during pkg_postinst
f4531ec qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
Conflicts:
recipes-qt/qt5/qtbase_git.bb
Change-Id: I853b6669bd4e42224b278587c412032903ba5555
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index c244a864..07092012 100644 --- a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 9409b83e634b53eb59cc0935424ea6fca1f50491 Mon Sep 17 00:00:00 2001 | 1 | From b3125c1b3f32915aa80acf58a9d1eeab4e260b17 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: Tue, 12 Dec 2017 16:06:14 +0200 | 3 | Date: Tue, 12 Dec 2017 16:06:14 +0200 |
| 4 | Subject: [PATCH] musl: don't use pvalloc as it's not available on musl | 4 | Subject: [PATCH] musl: don't use pvalloc as it's not available on musl |