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/0002-chromium-stack-pointer-clobber.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/0002-chromium-stack-pointer-clobber.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch index ed7f78f6..e2e86212 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 90881e8b608658e766bcf96fc62d97b39e005f01 Mon Sep 17 00:00:00 2001 | 1 | From dcc7962a9e9eb8fc10728df0b72e91794d1ee9d9 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: Sun, 23 Dec 2018 16:58:04 -0800 | 3 | Date: Sun, 23 Dec 2018 16:58:04 -0800 |
| 4 | Subject: [PATCH] chromium: stack pointer clobber | 4 | Subject: [PATCH] chromium: stack pointer clobber |
| @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 17 | 1 file changed, 3 insertions(+), 3 deletions(-) | 17 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 18 | 18 | ||
| 19 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | 19 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h |
| 20 | index 9276f56..622cc1f 100644 | 20 | index 9276f5627af..622cc1fbf7e 100644 |
| 21 | --- a/chromium/third_party/lss/linux_syscall_support.h | 21 | --- a/chromium/third_party/lss/linux_syscall_support.h |
| 22 | +++ b/chromium/third_party/lss/linux_syscall_support.h | 22 | +++ b/chromium/third_party/lss/linux_syscall_support.h |
| 23 | @@ -2012,7 +2012,7 @@ struct kernel_statfs { | 23 | @@ -2012,7 +2012,7 @@ struct kernel_statfs { |