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

* qtyocto/upstream/master:

  qtwebengine: disable generate_character_data
  qtwayland: fix build without xkbcommon-evdev
  qtwayland: Add libxkbcommon in the dependencies
  qtbase: create empty oe-device-extra.pri
  cmake_qt5.bbclass: add qtbase-native to DEPENDS
  Upgrade to Qt 5.8
  qtbase: Remove comments about ICU and QtWebKit
  qtwebkit: Always enable icu in QT_CONFIG
  qtwebengine: use QT_GIT_PROTOCOL variable

Conflicts:
	recipes-qt/qt5/qtbase_git.bb
	recipes-qt/qt5/qtwayland_git.bb

Change-Id: I8929585c07f462b7ff28c0342386d4114c0c0ee2

1 files changed, 2 insertions, 2 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 5efc35d5..3d139d0b 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
 "
 
 DEPENDS += "yasm-native"
-EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm"
+EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm GYP_CONFIG+=generate_character_data=0"
 
 # To use system ffmpeg you need to enable also libwebp, opus, vpx                                                                                           
 # Only depenedencies available in oe-core are enabled by default
@@ -105,7 +105,7 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "53-based"
 
 SRC_URI += " \
-    ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
+    ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
     file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
     file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
     file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \