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

18 files changed, 41 insertions, 41 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index bfe52a4..469042c 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -188,8 +188,8 @@ init() {
   ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE}
   ${REPO} sync
 
-  if [ ! -e "sources/meta-b2qt" ]; then
-    ln -s ${DIR} sources/meta-b2qt
+  if [ ! -e "sources/meta-boot2qt" ]; then
+    ln -s ${DIR} sources/meta-boot2qt
   fi
 
   if [ ! -e "sources/meta-qt5" ]  && [ -e "${DIR}/../meta-qt5" ]; then
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
index 255cfe8..ddd469b 100644
--- a/conf/bblayers.conf.bbb.sample
+++ b/conf/bblayers.conf.bbb.sample
@@ -46,9 +46,9 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample
index 19d60fe..75d7aae 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/conf/bblayers.conf.emulator.sample
@@ -43,7 +43,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-b2qt \
+  ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index ff9f351..1a255de 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -45,8 +45,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.intel.sample b/conf/bblayers.conf.intel.sample
index 4a5ab21..252be74 100644
--- a/conf/bblayers.conf.intel.sample
+++ b/conf/bblayers.conf.intel.sample
@@ -44,8 +44,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-intel-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-nuc-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample
index b93986e..f893f8c 100644
--- a/conf/bblayers.conf.nvidia-logan.sample
+++ b/conf/bblayers.conf.nvidia-logan.sample
@@ -45,9 +45,9 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-vib3-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-tegra-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-vib3-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index c3ca424..c788ab0 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -44,8 +44,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-raspberrypi-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-raspberrypi-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 333332f..8b3e578 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -46,11 +46,11 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-toradex \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample
index 7eeb4ae..55a9535 100644
--- a/conf/bblayers.conf.smx6.sample
+++ b/conf/bblayers.conf.smx6.sample
@@ -46,9 +46,9 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-smx6-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-smx6-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index f248c5c..527b404 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -45,8 +45,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
index 3d97eb5..6351d1f 100644
--- a/conf/bblayers.conf.tibidabo.sample
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -46,9 +46,9 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-architech-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-architech-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
index a44d891..7e49d04 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/bblayers.conf.toradex.sample
@@ -46,9 +46,9 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index d42823b..c280298 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4
 inherit qmake5 sdk-sources
 
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/demos.git;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos \
+    git://codereview.qt-project.org/qt-apps/boot2qt-demos.git;branch=${BRANCH};protocol=ssh;name=demos \
     ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \
     ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \
     git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=ssh;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index 4eddb56..44c7dcb 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -31,10 +31,10 @@ DESCRIPTION = "Boot to Qt Demo Launcher"
 LICENSE = "The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://src/main.cpp;md5=9320b0d61b46bdd5f27afcc40a0ad77f;beginline=1;endline=17"
 
-inherit qmake5 sdk-sources
+inherit qmake5
 
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/launcher;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-launcher \
+    git://codereview.qt-project.org/qt-apps/boot2qt-launcher;branch=${BRANCH};protocol=ssh \
     file://b2qt-startup.sh \
     file://qtlauncher.service \
     file://b2qt.service \
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
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 864ef05..bb86dd7 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -13,7 +13,7 @@
   <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/>
   <remote fetch="git://git.yoctoproject.org" name="intel"/>
   <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
-  <remote fetch="git://playground.ci.local" name="playground"/>
+  <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
 
   <project name="poky"
            remote="yocto"
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml
index 390486a..3555b7c 100644
--- a/scripts/manifest_jethro.xml
+++ b/scripts/manifest_jethro.xml
@@ -13,7 +13,7 @@
   <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/>
   <remote fetch="git://git.yoctoproject.org" name="intel"/>
   <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
-  <remote fetch="git://playground.ci.local" name="playground"/>
+  <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
 
   <project name="poky"
            remote="yocto"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 3e35ad8..f370032 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -99,18 +99,18 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   esac
 
   mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
-  cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
+  cp ${PWD}/sources/meta-boot2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
 
   if [ ! -d ${PWD}/sources/meta-qt5 ]; then
     sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
   fi
 
-  if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then
-    QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../../../)
+  if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
+    QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../)
   fi
 fi
 
-export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf"
+export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf"
 . sources/poky/oe-init-build-env ${BUILDDIRECTORY}
 
 # use sources from Qt SDK if that is available