diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass
index 3b7f422..ecee863 100644
--- a/classes/internal-build.bbclass
+++ b/classes/internal-build.bbclass
@@ -34,6 +34,7 @@ python enable_internal_build () {
     except:
         return
 
+    e.data.setVar('ENABLE_QTQUICKCOMPILER', "1")
     e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH")
     e.data.setVar('PREMIRRORS', "\
         ftp://.*/.*   http://yocto-cache.ci.local/sources/ \n \
diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
index 8dbaf49..3564ad1 100644
--- a/classes/qtquickcompiler.bbclass
+++ b/classes/qtquickcompiler.bbclass
@@ -28,18 +28,18 @@
 ############################################################################
 
 python __anonymous() {
-    provider = "qtquickcompiler"
+    provider = ""
+    sdk_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk"
+    pn = d.getVar("PN", True)
 
-    sdk_path = d.getVar('QT_SDK_PATH', True) or ""
-    if len(sdk_path) != 0:
-        qtquickcompiler_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk"
-        if not os.path.isdir(qtquickcompiler_path):
-            bb.note("QtQuickCompiler not available")
-            return
-        else:
-            provider = "qtquickcompiler-sdk"
+    if d.getVar('ENABLE_QTQUICKCOMPILER', True) == "1":
+        provider = "qtquickcompiler"
+    elif os.path.isdir(sdk_path):
+        provider = "qtquickcompiler-sdk"
+    else:
+        bb.note("qtquickcompiler not enabled for %s" % pn)
+        return
 
-    pn = d.getVar("PN", True)
     if "toolchain-host" in pn:
         d.appendVar('RDEPENDS_' + pn, " nativesdk-%s-tools" % provider)
     if "toolchain-target" in pn:
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"
 
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index bd0b9f7..eec5bc4 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -31,13 +31,13 @@ DESCRIPTION = "Boot to Qt Demos"
 LICENSE = "BSD | The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginline=1;endline=49"
 
-inherit qmake5 sdk-sources
+inherit qmake5
 
 SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/boot2qt-demos.git;branch=${BRANCH};protocol=http;name=demos \
+    ${QT_GIT}/qt-apps-boot2qt-demos.git;branch=${BRANCH};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/qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=http;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
+    ${QT_GIT}/qt-apps-qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
     https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \
     https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
     "
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index d5ff015..e131b2a 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -32,19 +32,17 @@ LICENSE = "(BSD & GPL-3.0) | The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/boot2qt-launcher;branch=${BRANCH};protocol=http \
+QT_MODULE = "qt-apps-boot2qt-launcher"
+
+SRC_URI += " \
     file://b2qt-startup.sh \
     file://qtlauncher.service \
     file://b2qt.service \
     "
 
 SRCREV = "7ff96b74f8721dbaf50722561770815a4530b6a0"
-BRANCH = "5.7"
-PV = "5.7+git${SRCPV}"
-
-S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative \
            ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb
index a12e83b..d63df0e 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/recipes-qt/b2qt-addons/democompositor_git.bb
@@ -32,14 +32,11 @@ LICENSE = "BSD | The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://main.cpp;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginline=1;endline=49"
 
 inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/boot2qt-demos.git;branch=${BRANCH};protocol=http \
-    "
+QT_MODULE = "qt-apps-boot2qt-demos"
 
 SRCREV = "a6d8f7ce79fb5c17e706f25daf4dda4d97b5323e"
-BRANCH = "5.7"
-PV = "5.7+git${SRCPV}"
 
 S = "${WORKDIR}/git/wayland/democompositor/"
 
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
similarity index 100%
rename from recipes-qt/qt5-addons/qtquickcompiler_git.bb
rename to recipes-qt/qt5/qtquickcompiler_git.bb
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}"