Merge remote-tracking branch 'qt/upstream/master' into lts-5.15

* New QtPdf recipe adjusted to use same revision as lts-5.15 branch
  qtwebengine
* New python3-ptest-qt recipe excluded
* QtWebengine from upstream is newer than stated v5.15.8, almost 5.15.9
  version, hence directly synced patches from upstream. Still needed
  0012-chromium-Add-missing-include-for-C-strncpy.patch to build
* Unneeded recipe specific QT_MODULE_BRANCH adjustments & module version
  alteration patches removed

changelog:
5b71df60 qt5-creator: add pkgconfig to inherit
851a0ad5 maliit-framework-qt5, maliit-plugins-qt5: Disable tests for gcc too
98086b54 ogl-runtime: Check for ppc64 before ppc
4837db1d qtwebengine: Add libxkbfile only when x11 is in distro features
74c27fa5 qt5: upgrade to v5.15.3-lts-lgpl
32e6203c qtwebkit: Fix build when x11 is not in distro features
121c1bfd qtpdf: Fix build with clang on aarch64
06647dd2 qtpdf: Fix build with clang
6f82e21d qtwebengine: Add missing libxkbfile dependency
347fcfb1 qtwebengine: fix build with newer icu+libxml
cc3d1c0c meta: update license names
5d4b73ad python3-pytest-qt: add 4.0.2
5fc0c4dc layers: Bump to use kirkstone
d38470c2 qtwebengine: upgrade to v5.15.8 and use the same SRCREVs as qtpdf
642c0e2e qtpdf: fix BSD license like in qtwebengine
a1232fbe qtpdf: remove duplicated patches
73326c90 qtpdf: add as dedicated recipe
f23d41fe recipes-qt: update ambiguous "BSD" license with "BSD-3-Clause"
ce5b4c9a qtbase: Fix ptest compilation with clang
b34ac6ed qt5: set ALLOW_EMPTY for mkspecs subpackage

Change-Id: Iafdfc96fa010231ece0b0b5dd286f7cd440aaa8d

1 files changed, 13 insertions, 12 deletions

diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index fd46cf98..60d7cda4 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -3,7 +3,7 @@ DEPENDS = "nativesdk-zlib qtbase-native"
 SECTION = "libs"
 HOMEPAGE = "http://qt-project.org"
 
-LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
+LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0-or-later | LGPL-3.0-only | The-Qt-Company-Commercial )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -25,7 +25,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared
-# 5.15.meta-qt5-shared.2
+# 5.15.meta-qt5-shared.3
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -38,21 +38,22 @@ SRC_URI += "\
     file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
     file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
     file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
-    file://0013-Disable-ltcg-for-host_build.patch \
-    file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
-    file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
-    file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
-    file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
-    file://0020-Revert-Fix-workaround-in-pthread-destructor.patch \
+    file://0012-Disable-ltcg-for-host_build.patch \
+    file://0013-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
+    file://0014-corelib-Include-sys-types.h-for-uint32_t.patch \
+    file://0015-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
+    file://0016-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
+    file://0017-Define-__NR_futex-if-it-does-not-exist.patch \
+    file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \
+    file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \
 "
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native
-# 5.15.meta-qt5-native.2
+# 5.15.meta-qt5-native.3
 SRC_URI += " \
-    file://0019-Always-build-uic-and-qvkgen.patch \
-    file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \
+    file://0021-Always-build-uic-and-qvkgen.patch \
+    file://0022-Avoid-renameeat2-for-native-sdk-builds.patch \
 "
 
 # CMake's toolchain configuration of nativesdk-qtbase