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, 4 deletions

diff --git a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch
index c733c156..57cfe368 100644
--- a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch
+++ b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch
@@ -1,4 +1,4 @@
-From 77365eda4dd1c4c26803b3f0d1f411b7416ad531 Mon Sep 17 00:00:00 2001
+From 7691598a164737591068f8670f02a904ffce5dd2 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 24 Nov 2017 15:16:31 +0200
 Subject: [PATCH] Bootstrap without linkat feature
@@ -13,11 +13,11 @@ Upstream-Status: Inappropriate [OE specific]
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
-index dabb715..5b4ff86 100644
+index 3469ebe..cb889f2 100644
 --- a/src/corelib/global/qconfig-bootstrapped.h
 +++ b/src/corelib/global/qconfig-bootstrapped.h
-@@ -88,7 +88,7 @@
- #define QT_FEATURE_futimes -1
+@@ -90,7 +90,7 @@
+ #define QT_FEATURE_itemmodel -1
  #define QT_FEATURE_library -1
  #ifdef __linux__
 -# define QT_FEATURE_linkat 1