Merge remote-tracking branch 'qtyocto/upstream/master' into 5.13

* upstream/master:
  6442c54 qt3d-runtime: update to ogl-runtime v2.4
  7bb213b qtvirtualkeyboard: update supported layouts
  eb63611 qt5-creator: Fix clangformat with clang 9.x
  12ea469 qttools: Add CONFIG+=config_clang_done when not building with clang
  dc502d5 qtwebengine: Fix compile failure with 5.2+ kernel headers
  8799d3b qtserialbus: Fix build with 5.2+ kernel headers
  e8aa2dd qtwebengine: Add pulseaudio support
  4d8f350 qtwebengine: Rename jasoncpp to jsoncpp
  725c87d qtwayland: do not reference private modules in cmake Qt5WaylandClient
  a41cd9e qtwayland: remove workaround for missing private headers (QTBUG-71340)

Conflicts:
  recipes-qt/qt5/qtserialbus_git.bb

Change-Id: I8f5248fb6f320555a231f59cddeb4c18ff810259

1 files changed, 29 insertions, 0 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
new file mode 100644
index 00000000..bdab820a
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
@@ -0,0 +1,29 @@
+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
+
+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
+
+ chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- 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;
+ #endif  // WEBRTC_POSIX
+ 
+ #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
++#include <linux/sockios.h>
+ 
+ int64_t GetSocketRecvTimestamp(int socket) {
+   struct timeval tv_ioctl;
+-- 
+2.21.0
+