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

1 files changed, 3 insertions, 6 deletions

diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
index d270cc0..eafae4e 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -31,18 +31,15 @@ DESCRIPTION = "Boot to Qt Appcontroller"
 LICENSE = "The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17"
 
-inherit qmake5 sdk-sources
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
 
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-appcontroller/ \
+    git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;branch=${QT_MODULE_BRANCH};protocol=http \
     file://appcontroller.conf \
     "
 
 SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28"
-BRANCH = "5.7"
-PV = "5.7+git${SRCPV}"
-
-S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase"