Merge remote-tracking branch 'qtyocto/5.13' into 5.14

* origin/5.13:
  12cc756 Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.13
  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/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
  recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
  recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
  recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
  recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
  recipes-qt/qt5/qtscxml_git.bb
  recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
  recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
  recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
  recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
  recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
  recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
  recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch

Change-Id: I475f15bad150bbc86ed49c1c0807fe0948e60723

1 files changed, 52 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
new file mode 100644
index 00000000..6df3ce0e
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -0,0 +1,52 @@
+From 51795812310685d2a392e3592b238a6fb92b75d3 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 a09bbf2c56e..b309f6b694e 100644
+--- a/chromium/base/process/process_metrics_posix.cc
++++ b/chromium/base/process/process_metrics_posix.cc
+@@ -100,14 +100,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;
+ }
+