diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-09-16 12:52:45 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-03 14:38:52 +0300 |
| commit | d778a6ca6fa7df4d16f5b0264bea010a91d21ad5 (patch) | |
| tree | d188d9e1abddfc7ea507f62184a44983945d916a /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | e8ee8bc088936129ca0d1335fc09c4e9e2a4aaa6 (diff) | |
| parent | dc2dedef9961950b88f4245ba7499538ec4244ab (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
* upstream/warrior:
dc2dede qtserialbus: Fix build with 5.2+ kernel headers
b4f9f22 qtwebengine: Fix compile failure with 5.2+ kernel headers
Conflicts:
recipes-qt/qt5/qtserialbus_git.bb
Change-Id: I9d44d28ba4918b1a570819f6bbefd10511ad7cd2
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index c3cea2bc..8f0b23be 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -156,6 +156,7 @@ SRC_URI += " \ file://chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch;patchdir=src/3rdparty \ file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ + file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \ " SRC_URI_append_libc-musl = "\ |