Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13

* qtyocto/upstream/zeus:
  432ad2a qttools: don't install tst_qtattributionsscanner
  8115617 qt5: Upgrade to Qt 5.13.2
  267e646 python(3)-pyqt5: add qml support
  653e12f libqofono: bump SRCREV and add a fix for voicecall
  cefb48e qtbase: Add PACKAGECONFIG for lttng
  911b346 layer: Mark zeus as compatible release
  c373272 ogl-runtime: Fix build on x86_64
  9172ba1 README.md: Document need for 32bit host compiler
  db2fd6c qtwayland: Fix build with clang/libc++
  6b5122e qtbase: Fix build when fp16 is used

Conflicts:
 recipes-qt/qt5/ogl-runtime_git.bb
 recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
 recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
 recipes-qt/qt5/qtbase_git.bb
 recipes-qt/qt5/qtwayland_git.bb

Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7

1 files changed, 8 insertions, 9 deletions

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
index bdab820a..6d9f73e4 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
@@ -1,22 +1,24 @@
+From 5408581e2ac5225ba2c6d6b0d88636751930577d Mon Sep 17 00:00:00 2001
 From: Jiri Slaby <jslaby@suse.cz>
 Date: Thu, 11 Jul 2019 09:35:13 +0200
-Subject: fix build after y2038 changes in glibc
-Patch-mainline: submitted on 2019/07/11
-References: QTBUG-76963
+Subject: [PATCH] chromium: fix build after y2038 changes in glibc
 
 SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that
 file wherever needed.
 
 Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
-Upstream-Status: Pending
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 
+Upstream-Status: Pending
+---
  chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 +
  1 file changed, 1 insertion(+)
 
+diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
+index c38d7fdfac9..575e0001ca1 100644
 --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
 +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
-@@ -67,6 +67,7 @@ typedef void* SockOptArg;
+@@ -71,6 +71,7 @@ typedef void* SockOptArg;
  #endif  // WEBRTC_POSIX
  
  #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
@@ -24,6 +26,3 @@ Upstream-Status: Pending
  
  int64_t GetSocketRecvTimestamp(int socket) {
    struct timeval tv_ioctl;
--- 
-2.21.0
-