Merge remote-tracking branch 'qt/upstream/master' into 5.15

* Diff in SRCREVs are due checkout from commit vs. checkout from
  corresponding tag in modules. The content is the same.
* metatypes inclusion was a bit different in upstream, synced with upstream
* update module_config.yaml

* upstream/master:
  02930760 qtmultimedia: create /usr/lib/plugins/videoeglvideonode referenced by Qt5MultimediaConfig.cmake
  b8bcf8cb qt5: upgrade to 5.15 beta3
  eac416fe qtdeclarative: bump SRCREV
  6558d2b5 nativesdk-qtbase: fix unpackaged files
  6b2323f3 qtwebengine: update patches for beta2
  20ae10f0 qt5: upgrade to 5.15 beta2
  a01de873 qtwebengine: fix QT_MODULE_BRANCH_CHROMIUM
  b88c292a qtquick3d: Fix branch for fetching assimp submodule
  df67d5a7 qt3d: update patch to apply
  a38953a6 qt5: upgrade to latest revisions in 5.15 branch
  9a645b02 qtwebengine: update patches for latest 5.15 revision
  6cce9817 qtwebengine: update patches for 5.15
  50e35581 qtbase: update patches for latest 5.15 revision
  9f024a55 qtdeclarative: add dependency on qtdeclarative-native
  76125ba8 qt5.inc: package metatypes files
  f3379951 qtbase: drop xkb, xcb-xinput PACKAGECONFIGs
  44405373 qt5: upgrade to latest revisions in 5.15 branch
  5e189731 layer: Mark dunfell as the only compatible release
  3e759d82 qtwebengine: Fix build with ninja >= 1.10.0
  f712bf9f python-pyqt5: remove PyQt_qreal_double from DISABLED_FEATURES
  79b0f3a6 python-pyqtchart: remove PyQt_qreal_double from DISABLED_FEATURES
  34ae49f8 qtmultimedia: Enable gstreamer support
  108b5664 gstreamer1.0-plugins-good: Turn on qt5 packageconfig
  4b6ce100 qt5-creator: Inherit mime-xdg
  89de99e7 python-{pyqt5,pyqtchart}: fold .inc file into .bb
  5d790449 python-pyqt5: drop python 2 recipe
  b2a958a4 python-pyqt5: disable whole PyQt_OpenGL and QtWidgets, QtQuickWidgets, QtQuick modules without opengl in DISTRO_FEATURES

Conflicts:
  conf/layer.conf
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
  recipes-qt/qt5/qt3d_git.bb
  recipes-qt/qt5/qt5-git.inc
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtlocation_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtquick3d_git.bb
  recipes-qt/qt5/qtremoteobjects_git.bb
  recipes-qt/qt5/qtserialport_git.bb
  recipes-qt/qt5/qttools_git.bb
  recipes-qt/qt5/qtvirtualkeyboard_git.bb
  recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
  recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch
  recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
  recipes-qt/qt5/qtwebengine_git.bb
  recipes-qt/qt5/qtwebview_git.bb

Change-Id: I61a651fd16d475ac0d8bbe119a3e3a8038692726

1 files changed, 52 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
new file mode 100644
index 00000000..ef12eec3
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -0,0 +1,52 @@
+From b941a200af8547946255c383b29c3f7b68598a75 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 7 Jul 2017 14:09:06 -0700
+Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ chromium/base/process/process_metrics_posix.cc    | 4 ++--
+ chromium/base/trace_event/malloc_dump_provider.cc | 2 ++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
+index 044bd8d244f..cec43e1d59b 100644
+--- a/chromium/base/process/process_metrics_posix.cc
++++ b/chromium/base/process/process_metrics_posix.cc
+@@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() {
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_ANDROID)
++#elif defined(__GLIBC__) || defined(OS_ANDROID)
+   struct mallinfo minfo = mallinfo();
+ #if BUILDFLAG(USE_TCMALLOC)
+   return minfo.uordblks;
+ #else
+   return minfo.hblkhd + minfo.arena;
+ #endif
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
+index 7e42cfc20bb..4e24fc711ad 100644
+--- a/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default;
+ // the current process.
+ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
+                                       ProcessMemoryDump* pmd) {
++#if defined(__GLIBC__)
+   {
+     base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_);
+     if (!emit_metrics_on_memory_dump_)
+@@ -175,6 +176,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
+                           MemoryAllocatorDump::kUnitsBytes,
+                           resident_size - allocated_objects_size);
+   }
++#endif // __GLIBC__
+   return true;
+ }
+