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

* qt/upstream/master:
  abb42351 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/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qt3d_git.bb
  recipes-qt/qt5/qt5-git.inc
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch
  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/qtdatavis3d_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtgamepad_git.bb
  recipes-qt/qt5/qtgraphicaleffects_git.bb
  recipes-qt/qt5/qtknx_git.bb
  recipes-qt/qt5/qtlocation_git.bb
  recipes-qt/qt5/qtlottie_git.bb
  recipes-qt/qt5/qtmqtt_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtnetworkauth_git.bb
  recipes-qt/qt5/qtopcua_git.bb
  [...] (41 conflicts)

Change-Id: Ib48e50eb939e7a8d0422c0beb75863b8a4b82b15

2 files changed, 6 insertions, 9 deletions

diff --git a/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch b/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch
index 262ad95e..60922e74 100644
--- a/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch
+++ b/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch
@@ -1,4 +1,4 @@
-From 2ca54b2296463f626f8438825907610cb22169fc Mon Sep 17 00:00:00 2001
+From d39e76b9662ea9cf236ac59749855e7da7ad29a8 Mon Sep 17 00:00:00 2001
 From: Piotr Tworek <tworaz@tworaz.net>
 Date: Wed, 3 Jul 2019 01:13:40 +0200
 Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to locate qmlcachegen
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch b/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
index e1067016..f55812b6 100644
--- a/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch
+++ b/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
@@ -1,4 +1,4 @@
-From dc94032e6132b41bd6927357e4a57c31436294eb Mon Sep 17 00:00:00 2001
+From 838fb4676f78d169dc88f87544cf1a4003302aea Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 26 Nov 2019 21:10:03 -0800
 Subject: [PATCH] Use python3 explicitly
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/qtdeclarative.pro b/qtdeclarative.pro
-index 5b94da9b6..0e3496ce8 100644
+index 5b94da9b69..0e3496ce80 100644
 --- a/qtdeclarative.pro
 +++ b/qtdeclarative.pro
 @@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
@@ -24,7 +24,7 @@ index 5b94da9b6..0e3496ce8 100644
      tmp = python_available
      CONFIG += $$tmp
 diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
-index 0e63ac2ce..7a30ab64e 100644
+index 1df4585aae..00038104ec 100644
 --- a/src/3rdparty/masm/masm.pri
 +++ b/src/3rdparty/masm/masm.pri
 @@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
@@ -36,7 +36,7 @@ index 0e63ac2ce..7a30ab64e 100644
      QMAKE_EXTRA_COMPILERS += udis86
  
      udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
-@@ -113,7 +113,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
+@@ -111,7 +111,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
  retgen.script = $$PWD/yarr/create_regex_tables
  retgen.input = retgen.script
  retgen.CONFIG += no_link
@@ -46,7 +46,7 @@ index 0e63ac2ce..7a30ab64e 100644
  
  # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
 diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py
-index 19551e3ba..bf3f79a45 100755
+index 19551e3ba2..bf3f79a45f 100755
 --- a/tests/auto/qml/ecmascripttests/test262.py
 +++ b/tests/auto/qml/ecmascripttests/test262.py
 @@ -1,4 +1,4 @@
@@ -55,6 +55,3 @@ index 19551e3ba..bf3f79a45 100755
  #############################################################################
  ##
  ## Copyright (C) 2017 The Qt Company Ltd.
--- 
-2.24.0
-