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

* qt/5.14:
  81da5b25 qt5: update submodules
  791c8520 ogl-runtime: update to v2.6.0
  86ca6270 (tag: v5.14.1) qtbase: update module
  1f7ea170 qt5: update submodules
  d708503f qt5: update submodules
  09821bcf qtwebengine: update patch with missing defines
  8db4ab35 qt5: update submodules

Change-Id: Ie29f04c6aff6451f694463d01ff4bb25cdc1a717

2 files changed, 21 insertions, 4 deletions

diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb
index 5e1f183f..1b5dc7c8 100644
--- a/recipes-qt/qt5/ogl-runtime_git.bb
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
 
-QT_MODULE_BRANCH = "2.5"
+QT_MODULE_BRANCH = "2.6"
 QT_MODULE_BRANCH_EASTL = "master"
 QT_GIT_PROJECT = "qt3dstudio"
-PV = "2.5.0+git${SRCPV}"
+PV = "2.6.0+git${SRCPV}"
 
 COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc64).*-linux"
 
@@ -22,7 +22,7 @@ SRC_URI += " \
     file://0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch \
 "
 
-SRCREV_ogl-runtime = "25236c672d81a73ee8754dbd764eb8a2a26d866e"
+SRCREV_ogl-runtime = "fe3ffda451732ebca0bdd7ecd19099f4cbfcfa75"
 SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5"
 SRCREV = "${SRCREV_ogl-runtime}"
 
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
index 0bd4a451..59b37719 100644
--- 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
@@ -12,9 +12,10 @@ 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/event_converter_evdev.h     | 5 +++++
  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(-)
+ 4 files changed, 15 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
@@ -31,6 +32,22 @@ index 5684f4121be..10f6357e6b5 100644
    ValidateEventTimeClock(&timestamp);
    return timestamp;
  }
+diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
+index a91807b60e8..74d46cb8608 100644
+--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
++++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
+@@ -20,6 +20,11 @@
+ #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
+ #include "ui/gfx/geometry/size.h"
+ 
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ struct input_event;
+ 
+ namespace ui {
 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