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

* qtyocto/upstream/master:
  qtscript: Update the custom patch from mainline
  qtbase: remove renameat2 PACKAGECONFIG
  qtbase: fix build with glibc-2.28 - for non-readers like me
  qtwebengine: Fix optonal glib-2.0 dependency
  qtwebkit_git.bb: Fix configure failure on bison
  qtwebengine: Add PACKAGECONFIG for pepper-plugins printing-and-pdf spellchecker
  qtwebengine: add a package config to enable proprietary codecs
  qt3d-runtime: add recipe for Qt 3D Studio runtime library
  qtbase: update the dependency for gbm PACKAGECONFIG
  qtbase: fix build with glibc-2.28
  nativesdk-packagegroup-qt5-toolchain-host: Add perl modules
  qtchooser: drop useless patch, set PV
  packagegroup-qt5-toolchain-target: Remove non-existing qttranslations-qt from rdeps
  qtbase: Add a kde PACKAGECONFIG

Change-Id: I8b407611ee7473bbd00ece06f6613d93ca56ca0d

1 files changed, 8 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 85b92664..4021fe74 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -53,12 +53,16 @@ PACKAGECONFIG[libvpx] = "-feature-webengine-system-libvpx,-no-feature-webengine-
 PACKAGECONFIG[libevent] = "-feature-webengine-system-libevent,-no-feature-webengine-system-libevent,libevent"
 PACKAGECONFIG[libpng] = "-feature-webengine-system-png,-no-feature-webengine-system-png,libpng"
 PACKAGECONFIG[harfbuzz] = "-feature-webengine-system-harfbuzz,-no-feature-webengine-system-harfbuzz,harfbuzz"
-PACKAGECONFIG[glib] = "-feature-webengine-system-glib,-no-feature-webengine-system-glib,glib"
+PACKAGECONFIG[glib] = "-feature-webengine-system-glib,-no-feature-webengine-system-glib,glib-2.0"
 PACKAGECONFIG[zlib] = "-feature-webengine-system-zlib,-no-feature-webengine-system-zlib,zlib"
 PACKAGECONFIG[protobuf] = "-feature-webengine-system-protobuf,-no-feature-webengine-system-protobuf,protobuf"
 PACKAGECONFIG[jasoncpp] = "-feature-webengine-system-jsoncpp,-no-feature-webengine-system-jsoncpp,jasoncpp"
 PACKAGECONFIG[libxml2] = "-feature-webengine-system-libxml2,-no-feature-webengine-system-libxml2,libxml2"
 PACKAGECONFIG[minizip] = "-feature-webengine-system-minizip,-no-feature-webengine-system-minizip,minizip"
+PACKAGECONFIG[proprietary-codecs] = "-feature-webengine-proprietary-codecs,-no-feature-webengine-proprietary-codecs"
+PACKAGECONFIG[pepper-plugins] = "-feature-webengine-pepper-plugins,-no-feature-webengine-pepper-plugins"
+PACKAGECONFIG[printing-and-pdf] = "-feature-webengine-printing-and-pdf,-no-feature-webengine-printing-and-pdf"
+PACKAGECONFIG[spellchecker] = "-feature-webengine-spellchecker,-no-feature-webengine-spellchecker"
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
@@ -120,6 +124,9 @@ PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 # for /usr/share/qt5/qtwebengine_resources.pak
 FILES_${PN} += "${OE_QMAKE_PATH_QT_TRANSLATIONS} ${OE_QMAKE_PATH_QT_DATA}"
 
+# Chromium uses libpci to determine which optimizations/workarounds to apply
+RDEPENDS_${PN}_append_x86 = " libpci"
+
 RDEPENDS_${PN}-examples += " \
     ${PN}-qmlplugins \
     qtquickcontrols-qmlplugins \