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

6 files changed, 94 insertions, 2 deletions

diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 1521dbfa..234cde8c 100755
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -83,6 +83,8 @@ RDEPENDS_${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtsensors-qmlplugins', '', d)} \
     qtserialport-dev \
     qtserialport-mkspecs \
+    qtserialbus-dev \
+    qtserialbus-mkspecs \
     qtsvg-dev \
     qtsvg-mkspecs \
     qtsvg-plugins \
@@ -106,6 +108,9 @@ RDEPENDS_${PN} += " \
     qtxmlpatterns-dev \
     qtxmlpatterns-mkspecs \
     qttranslations-qtxmlpatterns \
+    qtquickcontrols2 \
+    qtquickcontrols2-dev \
+    qtquickcontrols2-mkspecs \
 "
 
 RRECOMMENDS_${PN} += " \
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 3032c8f0..0788794b 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -115,6 +115,7 @@ do_configure() {
         -no-openssl \
         -no-xcb \
         -no-feature-bearermanagement \
+        -no-icu \
         -verbose \
         -release \
         -prefix ${OE_QMAKE_PATH_PREFIX} \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index b3351c7a..32c59498 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -32,6 +32,7 @@ SRC_URI += "\
 # common for qtbase-native and nativesdk-qtbase
 SRC_URI += " \
     file://0011-Always-build-uic.patch \
+    file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \
 "
 
 CLEANBROKEN = "1"
diff --git a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
new file mode 100644
index 00000000..e72601ca
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
@@ -0,0 +1,79 @@
+From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 6 Mar 2017 11:50:38 +0100
+Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped
+ dependenciies
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/src.pro                             | 9 ++-------
+ src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +--
+ src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +----
+ 3 files changed, 4 insertions(+), 13 deletions(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index 90d7e2b..0aaf604 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private
+ include($$OUT_PWD/corelib/qtcore-config.pri)
+ include($$OUT_PWD/gui/qtgui-config.pri)
+ 
+-force_bootstrap|!qtConfig(commandlineparser): \
+-    CONFIG += force_dbus_bootstrap
+-
+ src_qtzlib.file = $$PWD/corelib/qtzlib.pro
+ src_qtzlib.target = sub-zlib
+ 
+@@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap
+ 
+ src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp
+ src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
+-force_dbus_bootstrap: src_tools_qdbusxml2cpp.depends = src_tools_bootstrap_dbus
+-else: src_tools_qdbusxml2cpp.depends = src_dbus
++src_tools_qdbusxml2cpp.depends = src_dbus
+ 
+ src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml
+ src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
+-force_bootstrap: src_tools_qdbuscpp2xml.depends = src_tools_bootstrap_dbus
+-else: src_tools_qdbuscpp2xml.depends = src_dbus
++src_tools_qdbuscpp2xml.depends = src_dbus
+ 
+ src_winmain.subdir = $$PWD/winmain
+ src_winmain.target = sub-winmain
+diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+index 5ac3159..74c507c 100644
+--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
++++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+@@ -1,7 +1,6 @@
+ option(host_build)
+ QT = core-private
+-force_bootstrap: QT += bootstrap_dbus-private
+-else: QT += dbus-private
++QT += dbus-private
+ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
+ QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
+ 
+diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+index d9ee5de..e891103 100644
+--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
++++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+@@ -1,9 +1,6 @@
+ option(host_build)
+-!force_bootstrap:!qtConfig(commandlineparser): \
+-    CONFIG += force_bootstrap
+ QT = core-private
+-force_bootstrap: QT += bootstrap_dbus-private
+-else: QT += dbus-private
++QT += dbus-private
+ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
+ QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
+ 
+-- 
+2.9.3
+
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 64e51883..a6375a6c 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -105,7 +105,7 @@ PACKAGECONFIG[evdev] = "-evdev,-no-evdev"
 PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev"
 # depends on glib
 PACKAGECONFIG[fontconfig] = "-fontconfig,-no-fontconfig,fontconfig"
-PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+"
+PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+3"
 PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
 PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
 PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
@@ -171,6 +171,10 @@ do_install_append() {
     sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \
         -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \
         ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri
+
+    # Fix up absolute paths in scripts
+    grep -lr /usr/bin/perl ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/ | \
+        xargs -r sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,'
 }
 
 # mkspecs have mac specific scripts that depend on perl and bash
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
 }