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

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
new file mode 100644
index 00000000..2fdb0d82
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -0,0 +1,52 @@
+From 4b16ad982ff10945a37a7dd90735a5a1be3d6a8b 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 5763432aa4f..ff00b7307c0 100644
+--- a/chromium/base/process/process_metrics_posix.cc
++++ b/chromium/base/process/process_metrics_posix.cc
+@@ -109,14 +109,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 defined(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 0077d8b0aec..c69f893f4e9 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_)
+@@ -172,6 +173,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
+                           MemoryAllocatorDump::kUnitsBytes,
+                           resident_size - allocated_objects_size);
+   }
++#endif // __GLIBC__
+   return true;
+ }
+