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, 68 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000..0bd4a451
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,68 @@
+From b0d3cfec7837dcf818c08454a16eb44d78337a9f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Nov 2019 10:07:43 -0800
+Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
+
+time element is deprecated on new input_event structure in kernel's
+input.h [1]
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ chromium/ui/events/ozone/evdev/event_converter_evdev.cc    | 4 ++--
+ chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++---
+ chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h  | 5 +++++
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
+index 5684f4121be..10f6357e6b5 100644
+--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
++++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
+@@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback(
+ base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent(
+     const input_event& event) {
+   base::TimeTicks timestamp =
+-      ui::EventTimeStampFromSeconds(event.time.tv_sec) +
+-      base::TimeDelta::FromMicroseconds(event.time.tv_usec);
++      ui::EventTimeStampFromSeconds(event.input_event_sec) +
++      base::TimeDelta::FromMicroseconds(event.input_event_usec);
+   ValidateEventTimeClock(&timestamp);
+   return timestamp;
+ }
+diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
+index 363c3183e05..4fccfd62f84 100644
+--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
++++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
+@@ -59,11 +59,11 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
+   for (int i = 0; i < kDebugBufferSize; ++i) {
+     struct TouchEvent* te =
+         &logged_events_[(debug_buffer_tail_ + i) % kDebugBufferSize];
+-    if (te->ev.time.tv_sec == 0 && te->ev.time.tv_usec == 0)
++    if (te->ev.input_event_sec == 0 && te->ev.input_event_usec == 0)
+       continue;
+     std::string event_string = base::StringPrintf(
+-        "E: %ld.%06ld %04x %04x %d %d\n", te->ev.time.tv_sec,
+-        te->ev.time.tv_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
++        "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
++        te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
+     report_content += event_string;
+   }
+   file.Write(0, report_content.c_str(), report_content.length());
+diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
+index ccd3a499a38..5a2da89d09a 100644
+--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
++++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
+@@ -14,6 +14,11 @@
+ 
+ #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
+ 
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ namespace ui {
+ 
+ class EventDeviceInfo;