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

* qtyocto/upstream/master:

  qt: refresh remaining patches and tags in meta-qt5 repos
  qtwebengine: explicitly depend on bison-native
  qtmqtt: add recipe
  qtbase: fix a regression
  qtbase: introduce QT_EDITION
  packagegroup-qt5-qtcreator-debug: remove qtdeclarative-plugins

Conflicts:
  recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
  recipes-qt/qt5/qtquickcontrols_git.bb
  recipes-qt/qt5/qtserialbus_git.bb

Task-number: QTBUG-65164
Change-Id: Ifdb2bba80e68de28ec818fff2b2716645eb4d9c5

1 files changed, 33 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch
new file mode 100644
index 00000000..66b18384
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch
@@ -0,0 +1,33 @@
+From 0d33ce775fdd1ee1befe2016ea3f6860d4c6e389 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 15 Mar 2017 13:53:28 +0200
+Subject: [PATCH] chromium: Force host toolchain configuration
+
+Force gcc/g++ to be used for parts using host toolchain, since
+the option(host_build) does not work in yocto builds.
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ chromium/tools/gn/bootstrap/bootstrap.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py
+index b1ff7e7..bccabbb 100755
+--- a/chromium/tools/gn/bootstrap/bootstrap.py
++++ b/chromium/tools/gn/bootstrap/bootstrap.py
+@@ -318,10 +318,10 @@ def write_gn_ninja(path, root_gen_dir, options):
+     ld = os.environ.get('LD', cxx)
+     ar = os.environ.get('AR', 'ar -X64')
+   else:
+-    cc = os.environ.get('CC', 'cc')
+-    cxx = os.environ.get('CXX', 'c++')
++    cc = os.environ.get('CC_host', 'gcc')
++    cxx = os.environ.get('CXX_host', 'g++')
+     ld = cxx
+-    ar = os.environ.get('AR', 'ar')
++    ar = os.environ.get('AR_host', 'ar')
+ 
+   # QTBUG-64759
+   # cflags = os.environ.get('CFLAGS', '').split()