diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-13 15:40:55 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-14 10:02:55 +0200 |
commit | 15ce669550e7ee0dae4d16e7cd26d03e7a7a1cf4 (patch) | |
tree | efda9c84b34f6d3f5a37080f0c6398de37bebaef /recipes-qt/qt5/qtwebengine/chromium | |
parent | 370845a0acaa28d34800dcb08bf76e0d7aeeadb0 (diff) | |
parent | 9ff0a36249205d36bb44cc34a26cb6201180a89f (diff) | |
download | meta-qt5-15ce669550e7ee0dae4d16e7cd26d03e7a7a1cf4.tar.gz |
Merge remote-tracking branch 'qt/5.14' into 5.15
NOTE:
Qt License agreement update needs more recent Qt modules
content from 5.15 branch. Follow-up commit (submodule update)
will address the issue.
* qt/5.14:
9ff0a362 coin: update poky to 3.1_M1 from master
6776ec35 qtbase, qtwebengine: address issues introduced in latest upstream merge
5b2109a8 Merge remote-tracking branch 'qt/upstream/master' into 5.14
e4e2acba qtbase: Adjust target mkspec settings
e8ea2389 qt5: update submodules
d8e970eb knx, opcua: update changefiles
ca08d8c7 qt5: update submodules
f7841daf qt5: update submodules
25039161 qtwebengine: Fix build with 64bit time_t on 32bit architectures
280139a9 qt5: update submodules
4f3ed3ed qtwebkit: add missing flex-native dep
456ec4ac qt5-creator, qtbase: Replace python with python3
f264e5dd qtdeclarative: Ask for python3 explicitly
f6ad80f9 qtbase: Fix build on 32bit arches with 64bit time_t
b7f4bd20 recipes: Use features_check instead of distro_features_check
1a4ee018 qtwebengine: Fix musl build
02715fff pyqt5: Upgrade to 5.13.2
Conflicts:
coin/module_config.yaml
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
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/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtlottie_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquick3d_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: I98dab678c9904aef591fe933bf081b3f297e2021
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 00000000..ac16068c --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | From 6ae9112ffea9a5b7d41a06c3d33e55e4f32d8b5a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 30 Nov 2019 10:07:43 -0800 | ||
4 | Subject: [PATCH] Fix build on 32bit arches with 64bit time_t | ||
5 | |||
6 | time element is deprecated on new input_event structure in kernel's | ||
7 | input.h [1] | ||
8 | |||
9 | [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 4 ++-- | ||
14 | chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++--- | ||
15 | chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | 5 +++++ | ||
16 | 3 files changed, 10 insertions(+), 5 deletions(-) | ||
17 | |||
18 | diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc | ||
19 | index 684514ff011..e2f2ae0b633 100644 | ||
20 | --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc | ||
21 | +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc | ||
22 | @@ -168,8 +168,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback( | ||
23 | base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent( | ||
24 | const input_event& event) { | ||
25 | base::TimeTicks timestamp = | ||
26 | - ui::EventTimeStampFromSeconds(event.time.tv_sec) + | ||
27 | - base::TimeDelta::FromMicroseconds(event.time.tv_usec); | ||
28 | + ui::EventTimeStampFromSeconds(event.input_event_sec) + | ||
29 | + base::TimeDelta::FromMicroseconds(event.input_event_usec); | ||
30 | ValidateEventTimeClock(×tamp); | ||
31 | return timestamp; | ||
32 | } | ||
33 | diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | ||
34 | index 363c3183e05..4fccfd62f84 100644 | ||
35 | --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | ||
36 | +++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | ||
37 | @@ -59,11 +59,11 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { | ||
38 | for (int i = 0; i < kDebugBufferSize; ++i) { | ||
39 | struct TouchEvent* te = | ||
40 | &logged_events_[(debug_buffer_tail_ + i) % kDebugBufferSize]; | ||
41 | - if (te->ev.time.tv_sec == 0 && te->ev.time.tv_usec == 0) | ||
42 | + if (te->ev.input_event_sec == 0 && te->ev.input_event_usec == 0) | ||
43 | continue; | ||
44 | std::string event_string = base::StringPrintf( | ||
45 | - "E: %ld.%06ld %04x %04x %d %d\n", te->ev.time.tv_sec, | ||
46 | - te->ev.time.tv_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); | ||
47 | + "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, | ||
48 | + te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); | ||
49 | report_content += event_string; | ||
50 | } | ||
51 | file.Write(0, report_content.c_str(), report_content.length()); | ||
52 | diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | ||
53 | index ccd3a499a38..5a2da89d09a 100644 | ||
54 | --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | ||
55 | +++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | ||
56 | @@ -14,6 +14,11 @@ | ||
57 | |||
58 | #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" | ||
59 | |||
60 | +#ifndef input_event_sec | ||
61 | +#define input_event_sec time.tv_sec | ||
62 | +#define input_event_usec time.tv_usec | ||
63 | +#endif | ||
64 | + | ||
65 | namespace ui { | ||
66 | |||
67 | class EventDeviceInfo; | ||
68 | -- | ||
69 | 2.24.0 | ||
70 | |||