diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-11 14:12:10 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-11 14:59:12 +0100 |
| commit | 1fde17e1a570aa5495ecbe8a8daae95b628db260 (patch) | |
| tree | 8e9368e134349ab1dc69ddc3a573485cb97b10fc /recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch | |
| parent | ca649e3f6f03c5351a090852ff93a23e7382c86a (diff) | |
qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch | 14 |
1 files changed, 8 insertions, 6 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 c027fb68..7a5c7754 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 c200c1704501e5a74f72dedc3b3b76567d679e0d Mon Sep 17 00:00:00 2001 +From b83804eb1f9087800295cf40916577f932673dc8 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 @@ -10,11 +10,13 @@ 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] Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845 - --- + .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++- + .../input/evdevtouch/qevdevtouchhandler.cpp | 7 ++++++- + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -index 3555763..e7dc57c 100644 +index 3555763b89..e7dc57c027 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -58,6 +58,11 @@ @@ -29,7 +31,7 @@ index 3555763..e7dc57c 100644 QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") -@@ -150,7 +155,10 @@ +@@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state) qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); struct ::input_event led_ie; @@ -42,7 +44,7 @@ index 3555763..e7dc57c 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 78728ef..1d65f9b 100644 +index c51db59e1f..1f3726e291 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp @@ -58,6 +58,11 @@ @@ -57,7 +59,7 @@ index 78728ef..1d65f9b 100644 #include <math.h> #if QT_CONFIG(mtdev) -@@ -573,7 +578,7 @@ +@@ -576,7 +581,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data) // update timestamps m_lastTimeStamp = m_timeStamp; |