Merge remote-tracking branch 'origin/jethro' into merge

* origin/jethro:
  Rename last references to b2qt-utils
  Rename b2qt-utils to qtdeviceutilities
  toradex: apply u-boot and flashing script changes to colibri-imx7
  nitrogen6x: add Nitrogen6QP_MAX and SOMv2 support
  qt5: update submodules
  toradex: use latest u-boot and flashing scripts
  kontron: update to SMARC-sAMX6i BSP release v2.0, RC2
  Use code.qt.io with git protocol instead of codereview
  Use new repo url for utils and appcontroller
  kontron: patch kernel to support newer vivante drivers
  Fetch only external repos for repo mirror
  qt5: update submodules
  Add rsync to image
  Fix raspberry3 build error in perl deployment
  rcar-gen2: USB fixups
  ostree: Added dependency for systemd
  qtquickcompiler: update revision
  qtquickcompiler: update revision
  Fix typo in RPi overlay config
  Update meta layers

Conflicts:
	conf/distro/include/toradex.inc
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
	meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
	meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
	recipes/ostree/ostree.bb
	recipes/samba/samba_4.1.12.bbappend
	scripts/manifest_jethro.xml

Change-Id: I6b6ec105394f03fb57d8f922e358fef51de1e848

4 files changed, 6 insertions, 8 deletions

diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index 25a567d..391224e 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
-    b2qt-utils \
     qtivi \
     neptune-ui \
     neptune-ui-apps \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 9c2008d..3d60eed 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
-    b2qt-utils \
     b2qt-launcher \
     b2qt-demos \
     ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index cd1f2d8..ed7c8dc 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -44,11 +44,14 @@ RDEPENDS_${PN} += " \
     qt3d-dev \
     qtbase-dev \
     qtbase-staticdev \
-    qtcanvas3d \
+    qtcanvas3d-dev \
+    qtcharts-dev \
     qtconnectivity-dev \
+    qtdatavis3d-dev \
     qtdeclarative-dev \
     qtdeclarative-render2d-dev \
     qtdeclarative-staticdev \
+    qtdeviceutilities-dev \
     qtgraphicaleffects-dev \
     qtimageformats-dev \
     qtlocation-dev \
@@ -61,14 +64,10 @@ RDEPENDS_${PN} += " \
     qtsvg-dev \
     qttools-dev \
     qttools-staticdev \
+    qtvirtualkeyboard-dev \
     ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
     ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
     qtwebsockets-dev \
     qtwebchannel-dev \
     qtxmlpatterns-dev \
-    \
-    b2qt-utils-dev \
-    qtcharts-dev \
-    qtdatavis3d-dev \
-    qtvirtualkeyboard-dev \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 06de528..7d7160d 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -44,6 +44,7 @@ RDEPENDS_${PN} += " \
     qtdeclarative \
     qtdeclarative-render2d \
     qtdeclarative-tools \
+    qtdeviceutilities \
     qtgraphicaleffects \
     qtimageformats \
     qtlocation \