Merge remote-tracking branch 'qt/5.14' into 5.15

* qt/5.14:
  f6ebff39 Merge remote-tracking branch 'qt/upstream/master' into 5.14
  1b8e5570 qtbase: Use pcre packages by default
  fd7ac089 qt5: use PACKAGECONFIG to disable tests and examples
  1a7c8fa4 qtlocation: use geoclue 2
  ddbf8dd0 qtbase: use offscreen platform plugin for tools
  4f701ea1 qtbase: add openssl PACKAGECONFIG for native nativesdk
  56b2c13d qtbase-native: disable vulkan support
  6b34fd17 maliit-framework-qt5: fix test installations
  aa50163c qtenginio: remove obsolete module
  32edd746 ogl-runtime: update to v2.5.0 release
  f7dcc706 qtquick3d: add recipe
  b814111e qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
  1fde17e1 qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
  ca649e3f qt5: Update to Qt 5.14.0
  ede15adc qtbase: Fix patch fuzz detected with devtool
  e8221c2c qtbase: Backport the patch from upstream gerrit
  ca2f53f9 qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
  6e7cc682 qtwebengine: Move CharAllocator definition to header
  33a86256 qt5-creator: Add missing dep on libz.so
  3d47a569 qt5-creator: Make clang-format patch work with multiple clang versions
  d8f0db7f qtwebengine: Include cstddef for size_t definition
  b6bd407e qmllive: Fix build with multilib settings
  69e1fd33 quazip: Fix multilib builds
  a4db065b qtwebkit: Fix linking errors on clang/mips/ppc
  f756a065 ogl-runtime: Only compile for supported architectures
  710d995b qttools: Add option to disable qdoc
  a02e01ca qttools: Use CONFIG+=disable_external_rpath
  0d88f448 packagegroup-qt5-toolchain-target: Make machine specific
  2a2055fa recipes: Disable clang dependent recipes for riscv64/32

Conflicts:
  recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch

Change-Id: Ie1c25965f512eccade0a7518b3a2d23c6dc6b3c1

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;