diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-04-24 10:26:07 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-05-09 05:52:19 +0300 |
commit | db03213142de38997c95f53a5e731a92e9c48d2f (patch) | |
tree | 43176f11ca4a040b3292bcadeda888367f559a0e /recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |
parent | 5d375076a9c2b2e39f99012d3519a1cb2ff5811d (diff) | |
parent | 7a52f924a0298857db99be20aca1484bb2b4e163 (diff) |
Merge remote-tracking branch 'qtyocto/upstream/rocko' into 5.9
* qtyocto/upstream/rocko:
7a52f92 packagegroup-qt5-toolchain-target/qttranslations: fix nothing provides qttranslations-qtconfig
f48752c qt5: upgrade to 5.9.5
4e7ba65 Change default SRC_URI from github.com to code.qt.io
bf68f8b layer.conf: add LAYERSERIES_COMPAT
5b71698 maliit-framework-qt5: refresh patches
32bb7d1 qt5-git.inc: drop nobranch=1
Conflicts:
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
Change-Id: Ibea502ea07d8b7e145c1fa55cf82d8b70435d983
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch index 84209719..e4df9f67 100644 --- a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -1,4 +1,4 @@ -From f2ad400acf2c1f20dc9c4a903965d304589a2b93 Mon Sep 17 00:00:00 2001 +From 8d4ab971e015059b3509dff4e7b7ff0382c2c6fa Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:39:57 -0700 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl |