summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-04-08 15:36:11 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-04-15 15:23:26 +0300
commit34f4b7b004eb6fa46282fff5d8c8026caf64740b (patch)
tree290ec0cd4ee39c1f97c4a45a1a4cabd80e9d8b49 /recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
parent7de0cbd5dc9f80972ce559c9e340afbff0b9403d (diff)
downloadmeta-qt5-34f4b7b004eb6fa46282fff5d8c8026caf64740b.tar.gz
qt5: update submodules
Update to latest content in Qt 5.15 branch Task-number: QTBUG-80823 Change-Id: I72ecac4a29bf1d1f072169d709aa7ecdc895c0e5 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch10
1 files changed, 5 insertions, 5 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 7485a896..8bf8eee0 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
@@ -1,4 +1,4 @@
1From c24673923fca116df3bf59f19f8c668973f77e4d Mon Sep 17 00:00:00 2001 1From ac2c4d67820f7d571b2b6a2b64fcb145aabb3cec Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Nov 2019 10:07:43 -0800 3Date: Sat, 30 Nov 2019 10:07:43 -0800
4Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t 4Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
@@ -33,11 +33,11 @@ index 9f27d39e209..f565dd2ce5c 100644
33 return timestamp; 33 return timestamp;
34 } 34 }
35diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h 35diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
36index a91807b60e8..74d46cb8608 100644 36index 717410f2ebc..a4cd55ca20e 100644
37--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h 37--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
38+++ b/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 @@ 39@@ -20,6 +20,11 @@
40 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" 40 #include "ui/events/ozone/evdev/event_dispatch_callback.h"
41 #include "ui/gfx/geometry/size.h" 41 #include "ui/gfx/geometry/size.h"
42 42
43+#ifndef input_event_sec 43+#ifndef input_event_sec
@@ -68,12 +68,12 @@ index 363c3183e05..4fccfd62f84 100644
68 } 68 }
69 file.Write(0, report_content.c_str(), report_content.length()); 69 file.Write(0, report_content.c_str(), report_content.length());
70diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h 70diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
71index ccd3a499a38..5a2da89d09a 100644 71index 0d5b83148f6..1f17608e94d 100644
72--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h 72--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
73+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h 73+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
74@@ -14,6 +14,11 @@ 74@@ -14,6 +14,11 @@
75 75
76 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" 76 #include "base/component_export.h"
77 77
78+#ifndef input_event_sec 78+#ifndef input_event_sec
79+#define input_event_sec time.tv_sec 79+#define input_event_sec time.tv_sec