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

* upstream/master:

  nativesdk-qtbase: pass -no-icu for deterministic builds
  qtwebengine: show progress for do_compile
  packagegroup-qt5-toolchain-target: add qtquickcontrols2 package
  qtwebengine: add commercial license
  qtbase-native; do not build qdbuscpp2xml and qdbusxml2cpp bootstrapped
  packagegroup-qt5-toolchain-target: Add QtSerialBus to meta-toolchain-qt5.
  qtbase: PACKAGECONFIG[gtk] change gtk+ -> gtk+3 in dependencies
  qtbase: remove absolute binary paths from mkspec files
  qtbase-native: nativesdk-qtbase: remove patch that breaks mkspec setting for SDK

Change-Id: I99806099ccf7af78d61cba2df96b436cea76ddac

1 files changed, 3 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 133bd0f0..60815e7f 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -1,7 +1,7 @@
 SUMMARY = "QtWebEngine combines the power of Chromium and Qt"
 
 # Read http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
-LICENSE = "LGPL-3.0 & BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0"
+LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0 | The-Qt-Company-Commercial )"
 LIC_FILES_CHKSUM = " \
     file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \
     file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
@@ -87,6 +87,8 @@ do_configure() {
         ${EXTRA_QMAKEVARS_CONFIGURE}
 }
 
+do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
+
 do_install_append() {
     sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@[^ ]*${B}[^ ]* @@g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc
 }