diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-16 10:28:42 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-17 07:24:18 +0200 |
commit | 09821bcf8a979830e2a4b581829978d0e42230a4 (patch) | |
tree | eb93549cbd1adae9d9b7a324346957a13e45d196 | |
parent | 8db4ab3559c2566f668248890eb27979ad0a5d16 (diff) | |
download | meta-qt5-09821bcf8a979830e2a4b581829978d0e42230a4.tar.gz |
qtwebengine: update patch with missing defines
event_converter_evdev needs to have the defines as well.
Change-Id: I2445807f206e75c2004e84f62958fd26e468d19f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 0bd4a451..59b37719 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch | |||
@@ -12,9 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
13 | --- | 13 | --- |
14 | chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 4 ++-- | 14 | chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 4 ++-- |
15 | chromium/ui/events/ozone/evdev/event_converter_evdev.h | 5 +++++ | ||
15 | chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++--- | 16 | chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++--- |
16 | chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | 5 +++++ | 17 | chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | 5 +++++ |
17 | 3 files changed, 10 insertions(+), 5 deletions(-) | 18 | 4 files changed, 15 insertions(+), 5 deletions(-) |
18 | 19 | ||
19 | diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 20 | diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc |
20 | index 5684f4121be..10f6357e6b5 100644 | 21 | index 5684f4121be..10f6357e6b5 100644 |
@@ -31,6 +32,22 @@ index 5684f4121be..10f6357e6b5 100644 | |||
31 | ValidateEventTimeClock(×tamp); | 32 | ValidateEventTimeClock(×tamp); |
32 | return timestamp; | 33 | return timestamp; |
33 | } | 34 | } |
35 | diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h | ||
36 | index a91807b60e8..74d46cb8608 100644 | ||
37 | --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h | ||
38 | +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h | ||
39 | @@ -20,6 +20,11 @@ | ||
40 | #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" | ||
41 | #include "ui/gfx/geometry/size.h" | ||
42 | |||
43 | +#ifndef input_event_sec | ||
44 | +#define input_event_sec time.tv_sec | ||
45 | +#define input_event_usec time.tv_usec | ||
46 | +#endif | ||
47 | + | ||
48 | struct input_event; | ||
49 | |||
50 | namespace ui { | ||
34 | diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 51 | diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc |
35 | index 363c3183e05..4fccfd62f84 100644 | 52 | index 363c3183e05..4fccfd62f84 100644 |
36 | --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 53 | --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc |