Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11

* qtyocto/upstream/master:
  bc20e3d qt5-creator: upgrade to 4.5.1
  4a3318e tufao: fix build with Qt 5.11, don't use qt5_use_modules
  35f8981 qt5: upgrade to 5.11 beta3+
  5bbfbca packagegroup-qt5-toolchain-target: drop both qtwebkit packages
  f33be06 qt5: upgrade to 5.11 Alpha
  c754974 qtbase: use mysql_config from correct path
  41666dd qtmultimedia: Pass -DMESA_EGL_NO_X11_HEADERS=1 when x is disabled
  6563f37 cinematicexperience: Add liberation-fonts to RDEPENDS
  59c9742 qtlocation: Add licenses used under mapboxgl.
  1ce10cf qtwebkit: Update to latest on 5.9 branch
  4d09751 qtwebkit: Fix build on armv7ve (rpi)
  8666a50 qt5: bump libconnman-qt5 to 1.2.7
  45df5c9 .gitattributes: mark *.inc as Bitbake files
  d9001fc qtbase: fix umask for do_generate_qt_environment_file
  8124b3c packagegroup-qt5-toolchain-target/qttranslations: fix nothing provides qttranslations-qtconfig
  d5f4726 Change default SRC_URI from github.com to code.qt.io
  9ed1897 qt5-git.inc: drop nobranch=1
  f69baf2 maliit-framework-qt5: refresh patches
  61581ec layer.conf: add LAYERSERIES_COMPAT

Conflicts:
  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/qt5-git.inc
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
  recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtcanvas3d_git.bb
  recipes-qt/qt5/qtcharts_git.bb
  recipes-qt/qt5/qtconnectivity_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtgraphicaleffects_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/qtpurchasing_git.bb
  recipes-qt/qt5/qtquickcontrols2_git.bb
  recipes-qt/qt5/qtremoteobjects_git.bb
  recipes-qt/qt5/qtscript_git.bb
  recipes-qt/qt5/qtsensors_git.bb
  recipes-qt/qt5/qtsvg_git.bb
  recipes-qt/qt5/qttools_git.bb
  recipes-qt/qt5/qtvirtualkeyboard_git.bb
  recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
  recipes-qt/qt5/qtwayland_git.bb
  recipes-qt/qt5/qtwebengine_git.bb
  recipes-qt/qt5/qtwebsockets_git.bb

Task-number: QTBUG-67590
Change-Id: I62c5995490824324d61f13b2ef3044b97df0e9d3

1 files changed, 4 insertions, 3 deletions

diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 9c90ab97..1d57e6fb 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -11,14 +11,15 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
     file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \
 "
 
 require qt5-native.inc
 require qt5-git.inc
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
-# Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-shared
-# 5.10.meta-qt5-shared.2
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
+# 5.11.meta-qt5-shared.2
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -36,7 +37,7 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native
-# 5.10.meta-qt5-native.2
+# 5.11.meta-qt5-native.2
 SRC_URI += " \
     file://0013-Always-build-uic-and-qvkgen.patch \
 "