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

* origin/upstream/master:
  qtdeclarative: Use qmlcachegen provided by OE instead of system one.
  qtbase-native: Always use qt provided doubleconversion library.
  qttools: Enable clang support when using clang
  qt5-creator: update to v4.9.2
  maliit-framework-qt5: Fix build when ptest is enabled
  qtwebengine: Fix build on aarch64
  qtwebengine: refresh the patches to apply
  qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc
  qt5: Upgrade to Qt 5.13.0
  Allow enabling gui for native and nativesdk
  qt5everywheredemo: update HOMEPAGE
  qtconnectivity,qtsystems: Account for bluez4 from oe-core
  gdb_%.bbappend: Avoid PAK archive (application/x-pak)

Change-Id: I24e0b7b95920df3722f84a1f3a2e74546dc74810

1 files changed, 26 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Do-not-define-__sbrk-on-musl.patch
new file mode 100644
index 00000000..2bb6d115
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -0,0 +1,26 @@
+From da261d4402fac21694aeca82247974f4043934bc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 7 Jul 2017 15:39:57 -0700
+Subject: [PATCH] chromium: musl: Do not define __sbrk on musl
+
+musl libc does not have sbrk. on musl libc will only work when called with 0 as
+argument, so we just let it out for now
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h  | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
+index 59c1b6fb5f6..10f0786d829 100644
+--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
++++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
+@@ -213,7 +213,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size,
+   return result;
+ }
+ 
+-#ifndef __UCLIBC__
++#if !defined(__UCLIBC__) && defined(__GLIBC__)
+ // libc's version:
+ extern "C" void* __sbrk(intptr_t increment);
+