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

* origin/fido:
  Correctly update qtquickcompiler SHA1
  Reuse qt5-git.inc to define git repo location
  Remove automotive recipes
  Update Qt5 submodules
  Handle qtquickcompiler in update-qt5-modules.sh script
  Correctly use QtQuickCompiler when available
  Change git protocol from ssh to http
  Update qtdeclarative module
  Update boot2qt-demos version

Conflicts:
	conf/distro/b2qt-auto.conf
	recipes-qt/automotive/gammaray_git.bb
	recipes-qt/automotive/neptune-ui/neptune.service
	recipes-qt/automotive/neptune-ui_git.bb
	recipes-qt/automotive/qtapplicationmanager_git.bb
	recipes-qt/automotive/qtivi_git.bb
	recipes-qt/automotive/qtwebbrowser_git.bb
	recipes-qt/b2qt-addons/b2qt-demos.bb
	recipes-qt/b2qt-addons/b2qt-launcher.bb
	recipes-qt/b2qt-addons/democompositor_git.bb
	recipes-qt/images/b2qt-automotive-qt5-image.bb
	recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
	recipes-qt/qt5-addons/qtvirtualkeyboard_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/qtcharts_git.bb
	recipes-qt/qt5/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdatavis3d_git.bb
	recipes-qt/qt5/qtdeclarative-render2d_git.bb
	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/qtquickcompiler_git.bb
	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.bb
	recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
	recipes-qt/qt5/qtwayland-native_5.7-wip.bb
	recipes-qt/qt5/qtwayland-native_git.bbappend
	recipes-qt/qt5/qtwayland_5.7-wip.bb
	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: Ibf7f89a35c9e19bd8cf81c49cb44f6fd454838b4

1 files changed, 3 insertions, 0 deletions

diff --git a/scripts/update-qt5-modules.sh b/scripts/update-qt5-modules.sh
index c9e3949..d4087c3 100755
--- a/scripts/update-qt5-modules.sh
+++ b/scripts/update-qt5-modules.sh
@@ -47,6 +47,9 @@ for S in $SHA1S; do
     elif [ "${PROJECT}" = "qtwebengine/src/3rdparty" ]; then
         sed -i -e "/^SRCREV_chromium/s/\".*\"/\"${SHA1}\"/" qtwebengine_git.bb*
         echo "qtwebengine (chromium) -> ${SHA1}"
+    elif [ "${PROJECT}" = "tqtc-qmlcompiler" ]; then
+        sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" qtquickcompiler_git.bb*
+        echo "qtquickcompiler -> ${SHA1}"
     elif [ "$(echo *${PROJECT}*_git.bb*)" != "*${PROJECT}*_git.bb*" ]; then
         sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" *${PROJECT}*_git.bb*
         echo "${PROJECT} -> ${SHA1}"