diff options
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 @@ | |||
1 | From c200c1704501e5a74f72dedc3b3b76567d679e0d Mon Sep 17 00:00:00 2001 | 1 | From b83804eb1f9087800295cf40916577f932673dc8 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 25 Nov 2019 08:27:39 -0800 | 3 | Date: Mon, 25 Nov 2019 08:27:39 -0800 |
4 | Subject: [PATCH] input: Make use of timeval portable for 64bit time_t | 4 | 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. | |||
10 | See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign | 10 | See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign |
11 | Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610] | 11 | Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610] |
12 | Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845 | 12 | Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845 |
13 | |||
14 | --- | 13 | --- |
14 | .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++- | ||
15 | .../input/evdevtouch/qevdevtouchhandler.cpp | 7 ++++++- | ||
16 | 2 files changed, 15 insertions(+), 2 deletions(-) | ||
15 | 17 | ||
16 | diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | 18 | diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp |
17 | index 3555763..e7dc57c 100644 | 19 | index 3555763b89..e7dc57c027 100644 |
18 | --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | 20 | --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp |
19 | +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | 21 | +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp |
20 | @@ -58,6 +58,11 @@ | 22 | @@ -58,6 +58,11 @@ |
@@ -29,7 +31,7 @@ index 3555763..e7dc57c 100644 | |||
29 | QT_BEGIN_NAMESPACE | 31 | QT_BEGIN_NAMESPACE |
30 | 32 | ||
31 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") | 33 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") |
32 | @@ -150,7 +155,10 @@ | 34 | @@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state) |
33 | qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); | 35 | qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); |
34 | 36 | ||
35 | struct ::input_event led_ie; | 37 | struct ::input_event led_ie; |
@@ -42,7 +44,7 @@ index 3555763..e7dc57c 100644 | |||
42 | led_ie.code = led; | 44 | led_ie.code = led; |
43 | led_ie.value = state; | 45 | led_ie.value = state; |
44 | diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 46 | diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
45 | index 78728ef..1d65f9b 100644 | 47 | index c51db59e1f..1f3726e291 100644 |
46 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 48 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
47 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 49 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
48 | @@ -58,6 +58,11 @@ | 50 | @@ -58,6 +58,11 @@ |
@@ -57,7 +59,7 @@ index 78728ef..1d65f9b 100644 | |||
57 | #include <math.h> | 59 | #include <math.h> |
58 | 60 | ||
59 | #if QT_CONFIG(mtdev) | 61 | #if QT_CONFIG(mtdev) |
60 | @@ -573,7 +578,7 @@ | 62 | @@ -576,7 +581,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data) |
61 | 63 | ||
62 | // update timestamps | 64 | // update timestamps |
63 | m_lastTimeStamp = m_timeStamp; | 65 | m_lastTimeStamp = m_timeStamp; |