Merge remote-tracking branch 'qt/upstream/master' into 5.14

* qt/upstream/master: (28 commits)
  qtbase: Use pcre packages by default
  qt5: use PACKAGECONFIG to disable tests and examples
  qtlocation: use geoclue 2
  qtbase: use offscreen platform plugin for tools
  qtbase: add openssl PACKAGECONFIG for native nativesdk
  qtbase-native: disable vulkan support
  maliit-framework-qt5: fix test installations
  qtenginio: remove obsolete module
  ogl-runtime: update to v2.5.0 release
  qtquick3d: add recipe
  qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
  qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
  qt5: Update to Qt 5.14.0
  qtbase: Fix patch fuzz detected with devtool
  qtbase: Backport the patch from upstream gerrit
  qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
  qtwebengine: Move CharAllocator definition to header
  qt5-creator: Add missing dep on libz.so
  qt5-creator: Make clang-format patch work with multiple clang versions
  qtwebengine: Include cstddef for size_t definition
  ...

Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7

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 0d3b48ff..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 @@
-From c200c1704501e5a74f72dedc3b3b76567d679e0d Mon Sep 17 00:00:00 2001
+From b83804eb1f9087800295cf40916577f932673dc8 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 25 Nov 2019 08:27:39 -0800
 Subject: [PATCH] input: Make use of timeval portable for 64bit time_t
@@ -8,7 +8,7 @@ on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with
 and keeps old input.h implementation functional as well.
 
 See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
-
+Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610]
 Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845
 ---
  .../input/evdevkeyboard/qevdevkeyboardhandler.cpp      | 10 +++++++++-
@@ -44,7 +44,7 @@ index 3555763b89..e7dc57c027 100644
      led_ie.code = led;
      led_ie.value = state;
 diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-index 78728ef4ce..1d65f9b9f7 100644
+index c51db59e1f..1f3726e291 100644
 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
 +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
 @@ -58,6 +58,11 @@
@@ -59,7 +59,7 @@ index 78728ef4ce..1d65f9b9f7 100644
  #include <math.h>
  
  #if QT_CONFIG(mtdev)
-@@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
+@@ -576,7 +581,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
  
          // update timestamps
          m_lastTimeStamp = m_timeStamp;