diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:25:55 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:31:38 +0300 |
| commit | 0106f58f31df6b426dca2bb810fed5009d4cb28f (patch) | |
| tree | a84de94177cb0c9ae65628d0875ebe90365a2254 /recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch | |
| parent | e990651e683b47e60fc981dc4edb285a795ae490 (diff) | |
| parent | 17fb7499c12764264212b1a28eb5782c741964d5 (diff) | |
| download | meta-qt5-0106f58f31df6b426dca2bb810fed5009d4cb28f.tar.gz | |
Merge remote-tracking branch 'qtyocto/5.13' into dev
* qtyocto/5.13: (46 commits)
qtwayland: update module
qt5: update submodules
qt5: update submodules
qt3d-runtime: update to v2.3
qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
qtbase: add libxext dependency for xcb PACKAGECONFIG
python-pyqt5: Update to version 5.12.1.
python-pyqt: Fix annoying problems.
qtwebengine: arm: use OE specified -mcpu option
Revert "qtbase: Adjust target mkspec settings"
qtbase-tools: Fix error during pkg_postinst
qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
qtwayland: check also that the destination for private headers exists before installing them
qtwayland: improve manual header installation
qtwayland: workaround upstream bug: install missing headers manually
qtwayland: disable gold for all archs like in qtbase
qt5: upgrade to 5.12.3
qtbase: disable gold for all archs not just x86
...
Change-Id: I43d594b17bfeadc102a8817285c5834062e9cd75
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch index de1018d0..7823482b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 70292f3f8db60557b00a5ef550ef8c6a4a726f56 Mon Sep 17 00:00:00 2001 | 1 | From 249b99b4b54468b428a156f33e2a72066c82e9c2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 2 Feb 2019 19:28:59 -0800 | 3 | Date: Sat, 2 Feb 2019 19:28:59 -0800 |
| 4 | Subject: [PATCH] chromium: fix build with clang | 4 | Subject: [PATCH] chromium: fix build with clang |
| @@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 10 | 1 file changed, 2 insertions(+), 25 deletions(-) | 10 | 1 file changed, 2 insertions(+), 25 deletions(-) |
| 11 | 11 | ||
| 12 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn | 12 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn |
| 13 | index 1fb0a84..05e2208 100644 | 13 | index d223a4f6fd4..1c42c49ea4a 100644 |
| 14 | --- a/chromium/build/config/compiler/BUILD.gn | 14 | --- a/chromium/build/config/compiler/BUILD.gn |
| 15 | +++ b/chromium/build/config/compiler/BUILD.gn | 15 | +++ b/chromium/build/config/compiler/BUILD.gn |
| 16 | @@ -561,13 +561,6 @@ config("compiler") { | 16 | @@ -561,13 +561,6 @@ config("compiler") { |