Merge remote-tracking branch 'qt/5.14' into 5.15

* qt/5.14:
  de2ecaa1 coin: update module_config.yaml with meta-python2 support
  f9a58d62 Merge remote-tracking branch 'qt/upstream/master' into 5.14
  2da972e5 qt5: update submodules
  9be6548e qt5: update submodules
  b5e4f925 qtquicktimeline: add recipe
  abb42351 (qt/upstream/master) qtwebview: Skip if meta-python is not present
  caf09cd5 Add PyQtChart.
  f18d5948 qtbase: fix build with platform where FE macro are not defined
  c8cd55b0 qtwebkit: build with python3
  0bbd0ebe qtwebengine: Link libatomic on x86/32bit
  23914740 Revert "qtwebkit: remove"
  8cadcbcb qt5: upgrade to 5.14.1
  f13a3cec packagegroup-qt5-toolchain-target: Use TUNE_PKGARCH instead of MACHINE_ARCH
  a35403dc qtwebkit: remove
  a797f85c python-pyqt5, qtwebengine, qtwebkit, qt-kiosk-browser: skip without meta-python2
  b1f4f1fd Revert "recipes: Use python3 during build"
  47fb26de recipes: Use python3 during build
  4060f68d qt-kiosk-browser: Only support arm/x86
  fd376e15 qtwebengine: Fix missing headers found in build with clang
  7f324f11 gstreamer1.0-plugins-good: Adjust bbappend for meson migration in core
  1365691f qttools: remove ptest installation
  254576f9 qt-kiosk-browser: Add recipe
  47399df9 nativesdk-packagegroup: fix cmake builds using sdk

Conflicts:
  recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
  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/qtbase-native_git.bb
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtcharts_git.bb
  recipes-qt/qt5/qtcoap_git.bb
  recipes-qt/qt5/qtconnectivity_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtimageformats_git.bb
  recipes-qt/qt5/qtknx_git.bb
  recipes-qt/qt5/qtlocation_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtquick3d_git.bb
  recipes-qt/qt5/qtquickcontrols2_git.bb
  recipes-qt/qt5/qtremoteobjects_git.bb
  recipes-qt/qt5/qtscript_git.bb
  recipes-qt/qt5/qtserialbus_git.bb
  recipes-qt/qt5/qtsvg_git.bb
  recipes-qt/qt5/qttools_git.bb
  recipes-qt/qt5/qtwebengine_git.bb
  recipes-qt/qt5/qtwebsockets_git.bb
  recipes-qt/qt5/qtwebview_git.bb

Change-Id: I41b3b999dc1278342e33dda3b66af1990e8da090

1 files changed, 69 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtwebkit/0003-Fix-build-with-non-glibc-libc-on-musl.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-build-with-non-glibc-libc-on-musl.patch
new file mode 100644
index 00000000..bf79b363
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0003-Fix-build-with-non-glibc-libc-on-musl.patch
@@ -0,0 +1,69 @@
+From c4ceb318aa1064bfa677cdd800c52155eb1bed3a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 23 Aug 2018 04:06:17 +0000
+Subject: [PATCH] Fix build with non-glibc libc on musl
+
+Need to ensure glibc features are not assumed to be linux-wide
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Source/JavaScriptCore/heap/MachineStackMarker.cpp         | 8 ++++----
+ .../inspector/JSGlobalObjectInspectorController.cpp       | 2 ++
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+index 883914fd3..ce4e8d331 100644
+--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
++++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers::stackPointer() const
+ #error Unknown Architecture
+ #endif
+ 
+-#elif defined(__GLIBC__) && ENABLE(JIT)
++#elif defined(__linux__) && ENABLE(JIT)
+ 
+ #if CPU(X86)
+     return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
+@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers::framePointer() const
+ #error Unknown Architecture
+ #endif
+ 
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+ 
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers::instructionPointer() const
+ #error Unknown Architecture
+ #endif
+ 
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+ 
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers::llintPC() const
+ #error Unknown Architecture
+ #endif
+ 
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+ 
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
+index fd7f869d4..e95391b32 100644
+--- a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
++++ b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
+@@ -51,8 +51,10 @@
+ #include <cxxabi.h>
+ #if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
+ #include <dlfcn.h>
++#if defined(__GLIBC__)
+ #include <execinfo.h>
+ #endif
++#endif
+ 
+ #if ENABLE(REMOTE_INSPECTOR)
+ #include "JSGlobalObjectDebuggable.h"