0006-evdevtouch-fix-input_event-time-related-compile.patch 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. From c9adb999cdb21f991f2c70b1d3b40e16d4fed2c0 Mon Sep 17 00:00:00 2001
  2. From: Peter Seiderer <ps.report@gmx.net>
  3. Date: Mon, 4 May 2020 23:19:25 +0200
  4. Subject: [PATCH] evdevtouch: fix input_event time related compile
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. Fixes:
  9. evdevtouch/qevdevtouchhandler.cpp: In member function ‘void QEvdevTouchScreenData::processInputEvent(input_event*)’:
  10. evdevtouch/qevdevtouchhandler.cpp:579:29: error: ‘struct input_event’ has no member named ‘time’; did you mean ‘type’?
  11. m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0;
  12. ^~~~
  13. type
  14. evdevtouch/qevdevtouchhandler.cpp:579:49: error: ‘struct input_event’ has no member named ‘time’; did you mean ‘type’?
  15. m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0;
  16. ^~~~
  17. type
  18. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  19. Upstream: https://github.com/qt/qtbase/commit/71fb4d081c7f3675939ac8c62063631a18175fd1
  20. ---
  21. .../input/evdevtouch/qevdevtouchhandler.cpp | 10 +++++++++-
  22. 1 file changed, 9 insertions(+), 1 deletion(-)
  23. diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
  24. index c51db59e..94a9b103 100644
  25. --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
  26. +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
  27. @@ -58,6 +58,14 @@
  28. #include <linux/input.h>
  29. #endif
  30. +#ifndef input_event_sec
  31. +#define input_event_sec time.tv_sec
  32. +#endif
  33. +
  34. +#ifndef input_event_usec
  35. +#define input_event_usec time.tv_usec
  36. +#endif
  37. +
  38. #include <math.h>
  39. #if QT_CONFIG(mtdev)
  40. @@ -576,7 +584,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
  41. // update timestamps
  42. m_lastTimeStamp = m_timeStamp;
  43. - m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0;
  44. + m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0;
  45. m_lastTouchPoints = m_touchPoints;
  46. m_touchPoints.clear();
  47. --
  48. 2.26.2