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

* origin/jethro:
  Update meta layers
  Reuse qt5-git.inc in automotive recipes
  ota: update recipe
  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
  qtwebbrowser: update source uri
  Correctly use QtQuickCompiler when available
  gammaray: update revision to match gammaray plugin in QtC 4.1
  Fix adb to toradex-imx6 image
  Change git protocol from ssh to http
  Update qtdeclarative module
  Update boot2qt-demos version

Change-Id: I1665b538bcd12a0dffb6403a6d387eebb100c762

22 files changed, 99 insertions, 127 deletions

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/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/conf/distro/b2qt-auto.conf b/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend
index 2744cad..b696b19 100644
--- a/conf/distro/b2qt-auto.conf
+++ b/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend
@@ -27,7 +27,11 @@
 ##
 ############################################################################
 
-include conf/distro/b2qt.conf
+# kernel image files are not needed in the image
+RDEPENDS_kernel-base = ""
 
-PREFERRED_VERSION_qtwayland = "5.6%"
-PREFERRED_VERSION_qtwayland-native = "5.6%"
+do_configure_prepend () {
+    # FunctionFS for adb
+    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
+    echo "CONFIG_USB_ACM=m"         >> ${WORKDIR}/defconfig
+}
diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb
index 06fe24a..0456023 100644
--- a/recipes-qt/automotive/gammaray_git.bb
+++ b/recipes-qt/automotive/gammaray_git.bb
@@ -9,7 +9,7 @@ inherit cmake_qt5
 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}"
 
 BRANCH = "master"
-SRCREV = "4e8ff158816f07ced45a2cc71cf4176b7c0656d2"
+SRCREV = "6262eaeaee74109f9c1bd85de99c9b039d8938f5"
 PV = "master+git${SRCPV}"
 
 DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d"
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index 70f213b..66703c6 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -31,17 +31,17 @@ DESCRIPTION = "Neptune IVI UI"
 LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c"
 
-inherit qt5-module sdk-sources systemd
+inherit qt5-module systemd
+require recipes-qt/qt5/qt5-git.inc
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=http \
+QT_MODULE = "qt-apps-neptune-ui"
+QT_MODULE_BRANCH = "master"
+
+SRC_URI += " \
     file://neptune.service \
     "
 
 SRCREV = "3d36a7b8e53770c91db60cec9586ef572a2f2814"
-BRANCH = "master"
-
-S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative"
 RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \
diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/recipes-qt/automotive/qmllive-target_git.bb
index efcac4d..7819941 100644
--- a/recipes-qt/automotive/qmllive-target_git.bb
+++ b/recipes-qt/automotive/qmllive-target_git.bb
@@ -1,19 +1,48 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+
 DESCRIPTION = "QML Live target runtime"
 
 LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://../../LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c"
 
-inherit qmake5 sdk-sources
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
 
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+QT_MODULE = "qt-apps-qmllive"
+QT_MODULE_BRANCH = "master"
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/qmllive.git;branch=${BRANCH};protocol=ssh;name=tools \
+SRC_URI += " \
     file://qmllive-target.patch \
-"
+    "
 
-BRANCH = "master"
-SRCREV_tools="d0d41c71c4691a5f3e2b72e22917f314b4190ffc"
+SRCREV = "d0d41c71c4691a5f3e2b72e22917f314b4190ffc"
 
 S = "${WORKDIR}/git/src/runtime"
 
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
index fd128bd..028df78 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -31,21 +31,15 @@ DESCRIPTION = "Qt component for application lifecycle management"
 LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=317fda864ac33d41406ff3938c3e78d1"
 
-inherit qmake5 sdk-sources
-
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh \
-    "
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
 
 SRCREV = "8a4b17fade4507860919fbbf9ea42f813a26be76"
-BRANCH = "5.7"
 
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
            ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
 RDEPENDS_${PN} = "libcrypto"
 
-S = "${WORKDIR}/git"
-
 EXTRA_QMAKEVARS_PRE += "\
     ${@base_contains("DISTRO_FEATURES", "wayland", "-config force-multiprocess", "-config force-singleprocess", d)} \
     -config enable-dummydata \
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index b50defc..0c50457 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -35,15 +35,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
                     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
                     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
-inherit qt5-module sdk-sources
-
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/qtivi;branch=${BRANCH};protocol=ssh \
-    "
+inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
 
 SRCREV = "ccc1f3af652e4f2785d9ac60eeae521130740b1a"
-BRANCH = "5.7"
-
-S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb
index 3034760..b06446e 100644
--- a/recipes-qt/automotive/qtwebbrowser_git.bb
+++ b/recipes-qt/automotive/qtwebbrowser_git.bb
@@ -31,16 +31,13 @@ DESCRIPTION = "Qt Web Browser"
 LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6"
 
-inherit qmake5 sdk-sources
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser;branch=${BRANCH};protocol=http;sdk-uri=5.7/Src/qtwebbrowser \
-    "
+QT_MODULE = "qt-apps-qtwebbrowser"
+QT_MODULE_BRANCH = "dev"
 
 SRCREV = "023733af5523a5ad84359926224fa106001215f4"
-BRANCH = "dev"
-
-S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative qtwebengine"
 
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/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index 5ec66b4..25a567d 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -37,7 +37,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
     b2qt-utils \
-    b2qt-ota \
     qtivi \
     neptune-ui \
     neptune-ui-apps \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index ff2d206..9c2008d 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -37,7 +37,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
     b2qt-utils \
-    b2qt-ota \
     b2qt-launcher \
     b2qt-demos \
     ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index 5286ac5..652c931 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -53,6 +53,7 @@ RDEPENDS_${PN} += " \
     qtimageformats-dev \
     qtlocation-dev \
     qtmultimedia-dev \
+    qtotaupdate-dev \
     qtquickcontrols-dev \
     qtquickcontrols2-dev \
     qtsensors-dev \
@@ -68,7 +69,6 @@ RDEPENDS_${PN} += " \
     qtxmlpatterns-dev \
     \
     b2qt-utils-dev \
-    b2qt-ota-dev \
     qtcharts-dev \
     qtdatavis3d-dev \
     qtvirtualkeyboard-dev \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 06de528..8138b3e 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -48,6 +48,7 @@ RDEPENDS_${PN} += " \
     qtimageformats \
     qtlocation \
     qtmultimedia \
+    qtotaupdate \
     qtquickcontrols \
     qtquickcontrols2 \
     qtsensors \
diff --git a/recipes-qt/b2qt-addons/b2qt-ota.bb b/recipes-qt/qt5/qtotaupdate.bb
index 5b00b48..9cafd8c 100644
--- a/recipes-qt/b2qt-addons/b2qt-ota.bb
+++ b/recipes-qt/qt5/qtotaupdate.bb
@@ -1,3 +1,8 @@
+############################################################################
+##
+## 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$
@@ -23,20 +28,15 @@
 ############################################################################
 
 DESCRIPTION = "Qt OTA Update module"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://src/lib/qotaclient.h;md5=da66cc6e520f8151501c0f6c11480077;beginline=1;endline=28"
+LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/qtotaupdate;branch=${BRANCH};protocol=http \
-    "
+QT_GIT = "git://github.com/qt"
+QT_MODULE_BRANCH = "master"
 
-SRCREV = "d8d81530692454e4e38f682f6a09049d27b8c1ad"
-BRANCH = "master"
-PV = "git${SRCPV}"
-
-S = "${WORKDIR}/git"
+SRCREV = "f48ab751dd43906d5b9492e3f124b94f189b9971"
 
 DEPENDS = "qtbase qtdeclarative ostree"
-
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index 564fc3d..564fc3d 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5/qtquickcompiler_git.bb
diff --git a/recipes/os-release/os-release.bbappend b/recipes/os-release/os-release.bbappend
deleted file mode 100644
index a225573..0000000
--- a/recipes/os-release/os-release.bbappend
+++ /dev/null
@@ -1,47 +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$
-##
-############################################################################
-
-# Reported upstream https://bugzilla.yoctoproject.org/show_bug.cgi?id=9144
-python do_fix_quotes () {
-    with open(d.expand('${B}/os-release'), 'w') as f:
-        for field in d.getVar('OS_RELEASE_FIELDS', True).split():
-            value = d.getVar(field, True)
-            if value:
-                f.write('{0}="{1}"\n'.format(field, value))
-}
-
-do_verify_if_fixed_by_upstream () {
-    pretty_name_first_char=$(cat ${B}/os-release | grep "^PRETTY_NAME" | cut -f 2 -d '=' | cut -c1)
-    if [ "${pretty_name_first_char}" = "\"" ]] ; then
-        bbwarn "Issue appears to be fixed by upstream, remove this workaround."
-    fi
-}
-
-addtask do_verify_if_fixed_by_upstream after do_compile before do_install
-addtask do_fix_quotes after do_verify_if_fixed_by_upstream before do_install
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 9d6effc..3354dd2 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -17,11 +17,11 @@
 
   <project name="poky"
            remote="yocto"
-           revision="b1f23d1254682866236bfaeb843c0d8aa332efc2"
+           revision="40376446904ae3529be41737fed9a0b650ed167d"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="dc5634968b270dde250690609f0015f881db81f2"
+           revision="8ab04afbffb4bc5184cfe0655049de6f44269990"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
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}"