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, 3 insertions, 3 deletions

diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
index 610299d2..cf239a29 100644
--- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
+++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
@@ -1,4 +1,4 @@
-From 3114a9cd19b15f6b5ca99c4ce961ae5b80bfb3ab Mon Sep 17 00:00:00 2001
+From 642496d2ecd9b322c5b2e68ba9d9190c999d1d56 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Mon, 24 Oct 2016 09:45:18 +0300
 Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
-index afeb4f3d1d..aec5253c25 100644
+index 1ba9676..5b5bcdf 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -1235,7 +1235,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
+@@ -1238,7 +1238,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
                      error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
                  return($$result)
              }