diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-01-09 10:14:52 -0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-10 12:28:51 +0100 |
| commit | e8221c2c9ae403ed0eb022cd9d9b9b2a2c5ab0ef (patch) | |
| tree | 9d9d9d653a6ff222b8d79f6ea0792558bbf39d33 | |
| parent | ca2f53f91a77642a951806ff31cfd9be8543131d (diff) | |
qtbase: Backport the patch from upstream gerrit
This should address
https://github.com/meta-qt5/meta-qt5/commit/f6ad80f95ae9951fc8830dcf2cdec6430fb2d910#commitcomment-36707349
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch index 76b4671c..c027fb68 100644 --- a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch +++ b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch @@ -1,4 +1,4 @@ -From e06ac2e26c8490a7b8702e9462d1f38244ac3f0f Mon Sep 17 00:00:00 2001 +From c200c1704501e5a74f72dedc3b3b76567d679e0d Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 25 Nov 2019 08:27:39 -0800 Subject: [PATCH] input: Make use of timeval portable for 64bit time_t @@ -8,16 +8,13 @@ on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with and keeps old input.h implementation functional as well. See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign - Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610] -Signed-off-by: Khem Raj <raj.khem@gmail.com> +Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845 + --- - .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++- - .../input/evdevtouch/qevdevtouchhandler.cpp | 2 +- - 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -index 666613f09d..0e3e0ea0de 100644 +index 3555763..e7dc57c 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -58,6 +58,11 @@ @@ -32,8 +29,8 @@ index 666613f09d..0e3e0ea0de 100644 QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") -@@ -149,7 +154,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state) - qCDebug(qLcEvdevKey) << "switchLed" << led << state; +@@ -150,7 +155,10 @@ + qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); struct ::input_event led_ie; - ::gettimeofday(&led_ie.time, 0); @@ -45,10 +42,22 @@ index 666613f09d..0e3e0ea0de 100644 led_ie.code = led; led_ie.value = state; diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp -index f86f80785e..3914698f2a 100644 +index 78728ef..1d65f9b 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp -@@ -568,7 +568,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data) +@@ -58,6 +58,11 @@ + #include <linux/input.h> + #endif + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #include <math.h> + + #if QT_CONFIG(mtdev) +@@ -573,7 +578,7 @@ // update timestamps m_lastTimeStamp = m_timeStamp; @@ -57,6 +66,3 @@ index f86f80785e..3914698f2a 100644 m_lastTouchPoints = m_touchPoints; m_touchPoints.clear(); --- -2.24.0 - |