diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-06 12:32:13 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-10 09:03:25 +0200 |
commit | 5114e3057ceb4afc7f2ae9f71bb351f9e5c7f553 (patch) | |
tree | 970f133c757794bcdc024acff5e053ca621ad47d /recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch | |
parent | c29bdf41c4494e278a17a233048205bf212e040f (diff) | |
parent | de2ecaa13fde8f30b1a6558bbbbdfecfd3cd4bd8 (diff) | |
download | meta-qt5-5114e3057ceb4afc7f2ae9f71bb351f9e5c7f553.tar.gz |
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14:
de2ecaa1 coin: update module_config.yaml with meta-python2 support
f9a58d62 Merge remote-tracking branch 'qt/upstream/master' into 5.14
2da972e5 qt5: update submodules
9be6548e qt5: update submodules
b5e4f925 qtquicktimeline: add recipe
abb42351 (qt/upstream/master) qtwebview: Skip if meta-python is not present
caf09cd5 Add PyQtChart.
f18d5948 qtbase: fix build with platform where FE macro are not defined
c8cd55b0 qtwebkit: build with python3
0bbd0ebe qtwebengine: Link libatomic on x86/32bit
23914740 Revert "qtwebkit: remove"
8cadcbcb qt5: upgrade to 5.14.1
f13a3cec packagegroup-qt5-toolchain-target: Use TUNE_PKGARCH instead of MACHINE_ARCH
a35403dc qtwebkit: remove
a797f85c python-pyqt5, qtwebengine, qtwebkit, qt-kiosk-browser: skip without meta-python2
b1f4f1fd Revert "recipes: Use python3 during build"
47fb26de recipes: Use python3 during build
4060f68d qt-kiosk-browser: Only support arm/x86
fd376e15 qtwebengine: Fix missing headers found in build with clang
7f324f11 gstreamer1.0-plugins-good: Adjust bbappend for meson migration in core
1365691f qttools: remove ptest installation
254576f9 qt-kiosk-browser: Add recipe
47399df9 nativesdk-packagegroup: fix cmake builds using sdk
Conflicts:
recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtcoap_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtquick3d_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
Change-Id: I41b3b999dc1278342e33dda3b66af1990e8da090
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch new file mode 100644 index 00000000..32dde335 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From c2ca4923d5e534789b205968eb01779a90ec1299 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 15 Jan 2020 16:53:46 -0800 | ||
4 | Subject: [PATCH] chromium: Include <cstddef> and <cstdint> | ||
5 | |||
6 | These headers are needed for uintXX_t and size_t definitions | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | chromium/media/cdm/supported_cdm_versions.h | 1 + | ||
11 | .../third_party/perfetto/include/perfetto/base/task_runner.h | 1 + | ||
12 | chromium/third_party/webrtc/call/rtx_receive_stream.h | 1 + | ||
13 | 3 files changed, 3 insertions(+) | ||
14 | |||
15 | diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h | ||
16 | index 3f220da8c71..c54e3bb7d30 100644 | ||
17 | --- a/chromium/media/cdm/supported_cdm_versions.h | ||
18 | +++ b/chromium/media/cdm/supported_cdm_versions.h | ||
19 | @@ -6,6 +6,7 @@ | ||
20 | #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_ | ||
21 | |||
22 | #include <array> | ||
23 | +#include <cstddef> | ||
24 | |||
25 | #include "media/base/media_export.h" | ||
26 | #include "media/cdm/api/content_decryption_module.h" | ||
27 | diff --git a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h | ||
28 | index cf60401238f..02658e7139b 100644 | ||
29 | --- a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h | ||
30 | +++ b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h | ||
31 | @@ -18,6 +18,7 @@ | ||
32 | #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_ | ||
33 | |||
34 | #include <functional> | ||
35 | +#include <cstdint> | ||
36 | |||
37 | #include "perfetto/base/export.h" | ||
38 | |||
39 | diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h | ||
40 | index 8ffa4400a9c..a389fc2a574 100644 | ||
41 | --- a/chromium/third_party/webrtc/call/rtx_receive_stream.h | ||
42 | +++ b/chromium/third_party/webrtc/call/rtx_receive_stream.h | ||
43 | @@ -11,6 +11,7 @@ | ||
44 | #ifndef CALL_RTX_RECEIVE_STREAM_H_ | ||
45 | #define CALL_RTX_RECEIVE_STREAM_H_ | ||
46 | |||
47 | +#include <cstdint> | ||
48 | #include <map> | ||
49 | |||
50 | #include "call/rtp_packet_sink_interface.h" | ||