diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-08 14:10:13 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-11 14:03:48 +0100 |
commit | ca649e3f6f03c5351a090852ff93a23e7382c86a (patch) | |
tree | 3273897abf1ea0991a78ae884f967b2c88fa9811 /recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch | |
parent | ede15adc71f7f1c2acd63e96777b5d02d052a681 (diff) | |
download | meta-qt5-ca649e3f6f03c5351a090852ff93a23e7382c86a.tar.gz |
qt5: Update to Qt 5.14.0
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
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 | 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 4832464f..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 | |||
@@ -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 | @@ -149,7 +154,10 @@ void QEvdevKeyboardHandler::switchLed(in | 32 | @@ -150,7 +155,10 @@ |
33 | qCDebug(qLcEvdevKey) << "switchLed" << led << state; | 33 | qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(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 | @@ -55,6 +55,11 @@ | 48 | @@ -58,6 +58,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 | @@ -568,7 +573,7 @@ void QEvdevTouchScreenData::processInput | 60 | @@ -573,7 +578,7 @@ |
61 | 61 | ||
62 | // update timestamps | 62 | // update timestamps |
63 | m_lastTimeStamp = m_timeStamp; | 63 | m_lastTimeStamp = m_timeStamp; |