diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-13 15:40:55 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-14 10:02:55 +0200 |
commit | 15ce669550e7ee0dae4d16e7cd26d03e7a7a1cf4 (patch) | |
tree | efda9c84b34f6d3f5a37080f0c6398de37bebaef /recipes-qt/qt5/qtbase | |
parent | 370845a0acaa28d34800dcb08bf76e0d7aeeadb0 (diff) | |
parent | 9ff0a36249205d36bb44cc34a26cb6201180a89f (diff) | |
download | meta-qt5-15ce669550e7ee0dae4d16e7cd26d03e7a7a1cf4.tar.gz |
Merge remote-tracking branch 'qt/5.14' into 5.15
NOTE:
Qt License agreement update needs more recent Qt modules
content from 5.15 branch. Follow-up commit (submodule update)
will address the issue.
* qt/5.14:
9ff0a362 coin: update poky to 3.1_M1 from master
6776ec35 qtbase, qtwebengine: address issues introduced in latest upstream merge
5b2109a8 Merge remote-tracking branch 'qt/upstream/master' into 5.14
e4e2acba qtbase: Adjust target mkspec settings
e8ea2389 qt5: update submodules
d8e970eb knx, opcua: update changefiles
ca08d8c7 qt5: update submodules
f7841daf qt5: update submodules
25039161 qtwebengine: Fix build with 64bit time_t on 32bit architectures
280139a9 qt5: update submodules
4f3ed3ed qtwebkit: add missing flex-native dep
456ec4ac qt5-creator, qtbase: Replace python with python3
f264e5dd qtdeclarative: Ask for python3 explicitly
f6ad80f9 qtbase: Fix build on 32bit arches with 64bit time_t
b7f4bd20 recipes: Use features_check instead of distro_features_check
1a4ee018 qtwebengine: Fix musl build
02715fff pyqt5: Upgrade to 5.13.2
Conflicts:
coin/module_config.yaml
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtcoap_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtlottie_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquick3d_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: I98dab678c9904aef591fe933bf081b3f297e2021
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r-- | recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch | 70 |
1 files changed, 70 insertions, 0 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 new file mode 100644 index 00000000..0d3b48ff --- /dev/null +++ b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | From c200c1704501e5a74f72dedc3b3b76567d679e0d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 25 Nov 2019 08:27:39 -0800 | ||
4 | Subject: [PATCH] input: Make use of timeval portable for 64bit time_t | ||
5 | |||
6 | This patch avoids using time field of input_event structure which is not available | ||
7 | on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new | ||
8 | and keeps old input.h implementation functional as well. | ||
9 | |||
10 | See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign | ||
11 | |||
12 | Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845 | ||
13 | --- | ||
14 | .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++- | ||
15 | .../input/evdevtouch/qevdevtouchhandler.cpp | 7 ++++++- | ||
16 | 2 files changed, 15 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | ||
19 | index 3555763b89..e7dc57c027 100644 | ||
20 | --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | ||
21 | +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | ||
22 | @@ -58,6 +58,11 @@ | ||
23 | #include <linux/input.h> | ||
24 | #endif | ||
25 | |||
26 | +#ifndef input_event_sec | ||
27 | +#define input_event_sec time.tv_sec | ||
28 | +#define input_event_usec time.tv_usec | ||
29 | +#endif | ||
30 | + | ||
31 | QT_BEGIN_NAMESPACE | ||
32 | |||
33 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") | ||
34 | @@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state) | ||
35 | qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); | ||
36 | |||
37 | struct ::input_event led_ie; | ||
38 | - ::gettimeofday(&led_ie.time, 0); | ||
39 | + struct timeval tval; | ||
40 | + ::gettimeofday(&tval, 0); | ||
41 | + led_ie.input_event_sec = tval.tv_sec; | ||
42 | + led_ie.input_event_usec = tval.tv_usec; | ||
43 | led_ie.type = EV_LED; | ||
44 | led_ie.code = led; | ||
45 | led_ie.value = state; | ||
46 | diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | ||
47 | index 78728ef4ce..1d65f9b9f7 100644 | ||
48 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | ||
49 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | ||
50 | @@ -58,6 +58,11 @@ | ||
51 | #include <linux/input.h> | ||
52 | #endif | ||
53 | |||
54 | +#ifndef input_event_sec | ||
55 | +#define input_event_sec time.tv_sec | ||
56 | +#define input_event_usec time.tv_usec | ||
57 | +#endif | ||
58 | + | ||
59 | #include <math.h> | ||
60 | |||
61 | #if QT_CONFIG(mtdev) | ||
62 | @@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data) | ||
63 | |||
64 | // update timestamps | ||
65 | m_lastTimeStamp = m_timeStamp; | ||
66 | - m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0; | ||
67 | + m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0; | ||
68 | |||
69 | m_lastTouchPoints = m_touchPoints; | ||
70 | m_touchPoints.clear(); | ||