Merge remote-tracking branch 'origin/morty' into pyro

* origin/morty:

  meta-qt5: update layer
  sdk: don't add qtwayland-scanner to mingw toolchain
  sdk: add qtwayland tools to the toolchain
  qtdeviceutilities: update module
  b2qt-appcontroller: update SRCREV
  Fix DNS for Qemu running on b2qt toolchain sysroot
  qt5: update meta-qt5 layer

Change-Id: I0f21133d60417297225da9b9f27b49fd1b9dc400

4 files changed, 18 insertions, 5 deletions

diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass
index 7acd095..fd7b43c 100644
--- a/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/classes/populate_b2qt_qt5_sdk.bbclass
@@ -67,6 +67,9 @@ EOF
     echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf
 
     create_qtcreator_configure_script
+
+    # Link /etc/resolv.conf is broken in the toolchain sysroot, remove it
+    rm -f ${SDK_OUTPUT}${SDKTARGETSYSROOT}${sysconfdir}/resolv.conf
 }
 
 create_qtcreator_configure_script () {
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
index f1482a4..9c52606 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -29,7 +29,7 @@
 
 DESCRIPTION = "Boot to Qt Appcontroller"
 LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17"
+LIC_FILES_CHKSUM = "file://main.cpp;md5=f25c7436dbc72d4719a5684b28dbcf4b;beginline=1;endline=17"
 
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
@@ -39,7 +39,7 @@ SRC_URI = " \
     file://appcontroller.conf \
     "
 
-SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28"
+SRCREV = "5ab7fdbf0845c40418272bafa565295511055d3b"
 
 DEPENDS = "qtbase"
 
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
index 7dab944..a65435f 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
@@ -33,6 +33,12 @@ PR = "r0"
 
 inherit nativesdk packagegroup qtquickcompiler
 
+python __anonymous() {
+    overrides = d.getVar("OVERRIDES", True).split(":")
+    if "mingw32" not in overrides:
+        d.appendVar("OVERRIDES", ":linux")
+}
+
 RDEPENDS_${PN} += "\
     nativesdk-packagegroup-b2qt-embedded-toolchain-host \
     nativesdk-qttools-tools \
@@ -43,3 +49,7 @@ RDEPENDS_${PN} += "\
     nativesdk-qt3d-tools \
     nativesdk-qtscxml-tools \
     "
+
+RDEPENDS_${PN}_append_linux = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-qtwayland-tools', '', d)} \
+    "
diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb
index 473ab4d..3b8f18c 100644
--- a/recipes-qt/qt5/qtdeviceutilities.bb
+++ b/recipes-qt/qt5/qtdeviceutilities.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -43,6 +43,6 @@ SRC_URI = " \
     git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \
     "
 
-SRCREV = "48fb704e64300387f99c4192436728858c8aa4f8"
+SRCREV = "43e4b847851afc5d00664a9e88ef825ca9fedd02"
 
 DEPENDS = "qtbase qtdeclarative qtconnectivity"