diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:42:26 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:57:32 +0200 |
| commit | f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch) | |
| tree | d0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch | |
| parent | 9ff0a36249205d36bb44cc34a26cb6201180a89f (diff) | |
| parent | 1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff) | |
| download | meta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz | |
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits)
qtbase: Use pcre packages by default
qt5: use PACKAGECONFIG to disable tests and examples
qtlocation: use geoclue 2
qtbase: use offscreen platform plugin for tools
qtbase: add openssl PACKAGECONFIG for native nativesdk
qtbase-native: disable vulkan support
maliit-framework-qt5: fix test installations
qtenginio: remove obsolete module
ogl-runtime: update to v2.5.0 release
qtquick3d: add recipe
qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qt5: Update to Qt 5.14.0
qtbase: Fix patch fuzz detected with devtool
qtbase: Backport the patch from upstream gerrit
qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
qtwebengine: Move CharAllocator definition to header
qt5-creator: Add missing dep on libz.so
qt5-creator: Make clang-format patch work with multiple clang versions
qtwebengine: Include cstddef for size_t definition
...
Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch index 278a9b0c..55f61d03 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 156dd87c5579c355a8668c6b78c3853f2d288846 Mon Sep 17 00:00:00 2001 | 1 | From e44d59aff5c23049ed765d872b167c27f9d2be23 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 17f486447fe..06c93e5b3cf 100644 | 13 | index be485fd89b9..7179df05451 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 | @@ -773,8 +773,6 @@ config("compiler_cpu_abi") { | 16 | @@ -773,8 +773,6 @@ config("compiler_cpu_abi") { |