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

* origin/fido:
  meta layer was renamed to meta-boot2qt
  b2qt addons: update repository urls
  Use git.qt.io as the new playground repo server
  qtconnectivity: remove incorrect PACKAGECONFIG to enable bluez support
  qt5: update submodules and meta-qt5

Conflicts:
	conf/bblayers.conf.bbb.sample
	conf/bblayers.conf.emulator.sample
	conf/bblayers.conf.fsl.sample
	conf/bblayers.conf.intel.sample
	conf/bblayers.conf.nvidia-logan.sample
	conf/bblayers.conf.rpi.sample
	conf/bblayers.conf.sample
	conf/bblayers.conf.smx6.sample
	conf/bblayers.conf.ti.sample
	conf/bblayers.conf.tibidabo.sample
	conf/bblayers.conf.toradex.sample
	conf/distro/b2qt.conf
	recipes-qt/b2qt-addons/b2qt-demos.bb
	recipes-qt/b2qt-addons/b2qt-launcher.bb
	recipes-qt/qt5-addons/qtcharts_git.bb
	recipes-qt/qt5-addons/qtdatavis3d_git.bb
	recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
	recipes-qt/qt5-addons/qtquickcompiler_git.bb
	recipes-qt/qt5/nativesdk-qtbase_git.bbappend
	recipes-qt/qt5/qt3d_git.bbappend
	recipes-qt/qt5/qtbase-native_git.bbappend
	recipes-qt/qt5/qtbase_git.bbappend
	recipes-qt/qt5/qtcanvas3d_git.bbappend
	recipes-qt/qt5/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdeclarative_git.bbappend
	recipes-qt/qt5/qtgraphicaleffects_git.bbappend
	recipes-qt/qt5/qtimageformats_git.bbappend
	recipes-qt/qt5/qtlocation_git.bbappend
	recipes-qt/qt5/qtmultimedia_git.bbappend
	recipes-qt/qt5/qtquickcontrols2_git.bb
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtsensors_git.bbappend
	recipes-qt/qt5/qtserialbus_git.bb
	recipes-qt/qt5/qtserialport_git.bbappend
	recipes-qt/qt5/qtsvg_git.bbappend
	recipes-qt/qt5/qttools_git.bbappend
	recipes-qt/qt5/qttranslations_git.bbappend
	recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
	recipes-qt/qt5/qtwayland-native_git.bbappend
	recipes-qt/qt5/qtwayland_git.bbappend
	recipes-qt/qt5/qtwebchannel_git.bbappend
	recipes-qt/qt5/qtwebengine_git.bbappend
	recipes-qt/qt5/qtwebsockets_git.bbappend
	recipes-qt/qt5/qtxmlpatterns_git.bbappend
	scripts/manifest.xml

Change-Id: I06904eb8ff7a30240ce289808f43fbba6339f670

1 files changed, 1 insertions, 1 deletions

diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index e71a1c6..0b56d53 100755
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -48,7 +48,7 @@ for DIR in $(ls -d build-*); do
     bitbake b2qt-embedded-image meta-toolchain-b2qt-embedded-sdk
     if [ $? = 0 ]; then
         if [ -n "${UPLOAD}" ]; then
-            ../sources/meta-b2qt/scripts/upload.sh
+            ../sources/meta-boot2qt/scripts/upload.sh
         fi
     else
         echo "    build failed" >> ../build.log