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

diff --git a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch
new file mode 100644
index 00000000..55c6e22a
--- /dev/null
+++ b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch
@@ -0,0 +1,28 @@
+From 623675e07231f62cdc7600dca5897a9fc70e0467 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 14 Dec 2019 18:36:49 -0800
+Subject: [PATCH] src.pro: Add option noqdoc to disable qdoc builds
+
+it needs clang on host, so lets separate it out
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/src.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index 5c256ea3..196c34c7 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -25,7 +25,7 @@ qtConfig(library) {
+ 
+ include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+ QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
++qtConfig(qdoc): qtConfig(thread):!contains(CONFIG, noqdoc): SUBDIRS += qdoc
+ 
+ !android|android_app: SUBDIRS += qtpaths
+ 
+-- 
+2.24.1
+