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

2 files changed, 3 insertions, 33 deletions

diff --git a/conf/distro/b2qt-auto.conf b/conf/distro/b2qt-auto.conf
deleted file mode 100644
index 2744cad..0000000
--- a/conf/distro/b2qt-auto.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-
-include conf/distro/b2qt.conf
-
-PREFERRED_VERSION_qtwayland = "5.6%"
-PREFERRED_VERSION_qtwayland-native = "5.6%"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 9a1eb66..6851361 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -281,6 +281,9 @@ INHERIT += "rm_work"
 INHERIT += "image-buildinfo"
 INHERIT += "internal-build"
 
+# Enables use of QtQuickCompiler if you have access to the gerrit project
+#ENABLE_QTQUICKCOMPILER = "1"
+
 ACCEPT_FSL_EULA = "1"
 LICENSE_FLAGS_WHITELIST = "commercial"