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

* qt/upstream/master: (28 commits)
  qtbase: Use pcre packages by default
  qt5: use PACKAGECONFIG to disable tests and examples
  qtlocation: use geoclue 2
  qtbase: use offscreen platform plugin for tools
  qtbase: add openssl PACKAGECONFIG for native nativesdk
  qtbase-native: disable vulkan support
  maliit-framework-qt5: fix test installations
  qtenginio: remove obsolete module
  ogl-runtime: update to v2.5.0 release
  qtquick3d: add recipe
  qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
  qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
  qt5: Update to Qt 5.14.0
  qtbase: Fix patch fuzz detected with devtool
  qtbase: Backport the patch from upstream gerrit
  qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
  qtwebengine: Move CharAllocator definition to header
  qt5-creator: Add missing dep on libz.so
  qt5-creator: Make clang-format patch work with multiple clang versions
  qtwebengine: Include cstddef for size_t definition
  ...

Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7

1 files changed, 24 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
new file mode 100644
index 00000000..81d555f9
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -0,0 +1,24 @@
+From 59ab7f11b90bd2114ff8cc16d6502e0ad6bb6538 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 7 Jul 2017 15:09:02 -0700
+Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
+ for musl
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ chromium/base/allocator/allocator_shim.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
+index e6838ebda84..7296cc9ed81 100644
+--- a/chromium/base/allocator/allocator_shim.cc
++++ b/chromium/base/allocator/allocator_shim.cc
+@@ -351,7 +351,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) {
+ // In the case of tcmalloc we also want to plumb into the glibc hooks
+ // to avoid that allocations made in glibc itself (e.g., strdup()) get
+ // accidentally performed on the glibc heap instead of the tcmalloc one.
+-#if defined(USE_TCMALLOC)
++#if defined(USE_TCMALLOC) && defined(__GLIBC__)
+ #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h"
+ #endif
+