diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-23 16:03:15 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-23 16:14:34 +0300 |
| commit | 8acb105762bd239063f63d3c8ac23b91bddb23c5 (patch) | |
| tree | ac7d4ab8a6cb13fea4c30da5ee2d5e71de2d0c2b /recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch | |
| parent | bfa0b787902fb791bc49e38572ee387a2e9913f0 (diff) | |
| parent | d6b6838e55aae46699e4dbdc24c13bc405e94f32 (diff) | |
| download | meta-qt5-8acb105762bd239063f63d3c8ac23b91bddb23c5.tar.gz | |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
- Several modules are actually newer than beta4 in upstream,
hence the conflicts with SRCREVs.
- Replaced/removed local QPainterPath patches for qwt &
creator with upstream ones.
- Updated the qtwebkit SRCREV to sync with upstream as it
switched to same "5.212" branch as locally already, but
kept the riscv patch
* upstream/master:
d6b6838e qt5: upgrade to 5.15 beta4
05b3e648 qtwebkit: Switch to 5.212 branch
abed512f qt5-creator: Upgrade to 4.12 branch
32c62abe qwt-qt5: fix build with Qt 5.15
44fc90ee gstreamer1.0-plugins-good: Reemove inserting qt5 from packageconfig
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-creator_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtquick3d_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebkit_git.bb
recipes-qt/qwt/qwt-qt5_6.1.4.bb
Change-Id: Icf6e747da78059c23568ea00ebbe50b28588aa3f
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch index c2a0338c..b64fd9a3 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 046704d6ac338b548a85dc1f7af5810276175a9f Mon Sep 17 00:00:00 2001 | 1 | From 6211643cff8c828be75f6504ec16246f8746add4 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: Thu, 2 Jan 2020 17:13:55 -0800 | 3 | Date: Thu, 2 Jan 2020 17:13:55 -0800 |
| 4 | Subject: [PATCH] chromium: Move CharAllocator definition to a header file | 4 | Subject: [PATCH] chromium: Move CharAllocator definition to a header file |