summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-05-28 11:53:32 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-06-01 09:39:49 +0300
commitc46b743fd1867e3ad4ecae3b016413fa4e534fd0 (patch)
tree2d256cd063ed098d1d0e3562e5f76dcd38ecd928 /recipes-qt/qt5/qtbase
parent8b4a01436c10cfd79db28f6462f0769dc7de0539 (diff)
downloadmeta-qt5-c46b743fd1867e3ad4ecae3b016413fa4e534fd0.tar.gz
qt5: update submodules
Update to latest content in Qt 5.15 branch. Notes: - qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch included in qtbase - qtdeclarative/0002-Use-python3-explicitly.patch removed due QTBUG-84038 Task-number: QTBUG-84150 Change-Id: I183d3d9ed73febd09407ab241af88f707473bca0 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
deleted file mode 100644
index 133c43bb..00000000
--- a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From b9b6172194de411c2c68e81c427a79b0a1227e3e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 25 Nov 2019 08:27:39 -0800
4Subject: [PATCH] input: Make use of timeval portable for 64bit time_t
5
6This patch avoids using time field of input_event structure which is not available
7on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new
8and keeps old input.h implementation functional as well.
9
10See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
11Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610]
12Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845
13---
14 .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++-
15 .../input/evdevtouch/qevdevtouchhandler.cpp | 7 ++++++-
16 2 files changed, 15 insertions(+), 2 deletions(-)
17
18diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
19index 3555763b89..e7dc57c027 100644
20--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
21+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
22@@ -58,6 +58,11 @@
23 #include <linux/input.h>
24 #endif
25
26+#ifndef input_event_sec
27+#define input_event_sec time.tv_sec
28+#define input_event_usec time.tv_usec
29+#endif
30+
31 QT_BEGIN_NAMESPACE
32
33 Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input")
34@@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state)
35 qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state));
36
37 struct ::input_event led_ie;
38- ::gettimeofday(&led_ie.time, 0);
39+ struct timeval tval;
40+ ::gettimeofday(&tval, 0);
41+ led_ie.input_event_sec = tval.tv_sec;
42+ led_ie.input_event_usec = tval.tv_usec;
43 led_ie.type = EV_LED;
44 led_ie.code = led;
45 led_ie.value = state;
46diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
47index 78728ef4ce..1d65f9b9f7 100644
48--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
49+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
50@@ -58,6 +58,11 @@
51 #include <linux/input.h>
52 #endif
53
54+#ifndef input_event_sec
55+#define input_event_sec time.tv_sec
56+#define input_event_usec time.tv_usec
57+#endif
58+
59 #include <math.h>
60
61 #if QT_CONFIG(mtdev)
62@@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
63
64 // update timestamps
65 m_lastTimeStamp = m_timeStamp;
66- m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0;
67+ m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0;
68
69 m_lastTouchPoints = m_touchPoints;
70 m_touchPoints.clear();