Merge remote-tracking branch 'origin/fido' into dev

* origin/fido: (36 commits)
  qt5: update submodules
  b2qt-demos: update revision
  b2qt-appcontroller: update revision
  qt5: move mingw32 specific parts from meta-qt5
  qt5: Use latest version of meta-qt5
  b2qt-demos: update to new revision
  ostree: Mount boot partition from user space
  ostree: Do not use grub2-mkconfig.
  RPi2: add support for touch display
  Disable ethernet over usb on beaglebone.
  qtwayland: update SRCREV
  Move default sstate-cache dir from build dir
  Use distro specific sstate cache
  qtquickcompiler: add support for BYOS builds
  qtcharts: update revision
  qt5: update submodules
  democompositor: use correct path the SDK sources
  b2qt-demos: update SRCREV
  Add git SHA1 to b2qt addon package versions
  b2qt-utils: update SRCREV
  ...

Conflicts:
	recipes-qt/qt5/qtconnectivity_git.bbappend

Change-Id: I1c090c8f87e43664971e0381b93ccad5e4e48175

1 files changed, 1 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index 67cd0dd..8057fbb 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -19,5 +19,6 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3"