diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-11 14:01:43 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-11 14:02:15 +0100 |
| commit | ede15adc71f7f1c2acd63e96777b5d02d052a681 (patch) | |
| tree | 8d61e42e883a1a755953cf19658ab48919a2e965 | |
| parent | e8221c2c9ae403ed0eb022cd9d9b9b2a2c5ab0ef (diff) | |
| download | meta-qt5-ede15adc71f7f1c2acd63e96777b5d02d052a681.tar.gz | |
qtbase: Fix patch fuzz detected with devtool
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch | 8 |
1 files changed, 4 insertions, 4 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..4832464f 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 | |||
| @@ -29,8 +29,8 @@ index 3555763..e7dc57c 100644 | |||
| 29 | QT_BEGIN_NAMESPACE | 29 | QT_BEGIN_NAMESPACE |
| 30 | 30 | ||
| 31 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") | 31 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") |
| 32 | @@ -150,7 +155,10 @@ | 32 | @@ -149,7 +154,10 @@ void QEvdevKeyboardHandler::switchLed(in |
| 33 | qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); | 33 | qCDebug(qLcEvdevKey) << "switchLed" << led << state; |
| 34 | 34 | ||
| 35 | struct ::input_event led_ie; | 35 | struct ::input_event led_ie; |
| 36 | - ::gettimeofday(&led_ie.time, 0); | 36 | - ::gettimeofday(&led_ie.time, 0); |
| @@ -45,7 +45,7 @@ diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/p | |||
| 45 | index 78728ef..1d65f9b 100644 | 45 | index 78728ef..1d65f9b 100644 |
| 46 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 46 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
| 47 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 47 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
| 48 | @@ -58,6 +58,11 @@ | 48 | @@ -55,6 +55,11 @@ |
| 49 | #include <linux/input.h> | 49 | #include <linux/input.h> |
| 50 | #endif | 50 | #endif |
| 51 | 51 | ||
| @@ -57,7 +57,7 @@ index 78728ef..1d65f9b 100644 | |||
| 57 | #include <math.h> | 57 | #include <math.h> |
| 58 | 58 | ||
| 59 | #if QT_CONFIG(mtdev) | 59 | #if QT_CONFIG(mtdev) |
| 60 | @@ -573,7 +578,7 @@ | 60 | @@ -568,7 +573,7 @@ void QEvdevTouchScreenData::processInput |
| 61 | 61 | ||
| 62 | // update timestamps | 62 | // update timestamps |
| 63 | m_lastTimeStamp = m_timeStamp; | 63 | m_lastTimeStamp = m_timeStamp; |
