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

* origin/morty:

  qdb: remove bashishm from the init script
  qt5: update qtx11extras submodule & quickcompiler revision
  meta-qt5: update to 5.9.2 RC
  Add generic qemuarmv7 machine config
  meta-qt5: update meta layer
  quickcompiler: update revision
  meta-qt5: update layer
  poky, meta-oe: update morty branch layers
  qtquickcompiler: fix path for QT_HOST_BINS
  sdk: fix host_build QT_ARCH
  qtdeviceutilities: update component
  qtwebview: include qtwebview into image and toolchain

Conflicts:
   recipes-qt/qt5-addons/qtglesstream.bb
   recipes-qt/qt5/qtdeviceutilities.bb
   recipes-qt/qt5/qtquickcompiler_git.bb
   scripts/manifest.xml

Change-Id: I42667bfd90b1136604213805a0d70c3936a96776

2 files changed, 9 insertions, 2 deletions

diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index 80fd072..d0663e2 100644
--- a/recipes-qt/qt5/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5/qtquickcompiler_git.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,4 +43,9 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative"
 
+do_install_append() {
+    # Use the EffectivePath instead of installation path
+    sed -i -e 's|QT_HOST_BINS|QT_HOST_BINS/get|' ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features/qtquickcompiler.prf
+}
+
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend
index 2a949eb..57c8285 100644
--- a/recipes-qt/qt5/qtsystems_git.bbappend
+++ b/recipes-qt/qt5/qtsystems_git.bbappend
@@ -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,3 +29,5 @@
 
 EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator"
 DEPENDS_append_emulator = " qtsimulator"
+
+SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37"