9 files changed, 16 insertions, 17 deletions

diff --git a/classes/qt5-module.bbclass b/classes/qt5-module.bbclass
new file mode 100644
index 0000000..2f186e8
--- /dev/null
+++ b/classes/qt5-module.bbclass
@@ -0,0 +1 @@
+require recipes-qt/qt5/qt5.inc
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 0fb16ef..a64f457 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -47,7 +47,6 @@ RDEPENDS_${PN} += " \
     qtsensors-dev \
     qtserialport-dev \
     qtsvg-dev \
-    qtsystems-dev \
     qttools-dev \
     qttools-staticdev \
     ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb
index 93785a0..861f61a 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb
@@ -42,9 +42,11 @@ RDEPENDS_${PN} += " \
     qtsensors \
     qtserialport \
     qtsvg \
+    qttools \
     ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
     ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
     qtwebsockets \
+    qtwebchannel \
     qtxmlpatterns \
     qtquickcontrols \
     "
diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb
index 06cec02..dfcda8d 100644
--- a/recipes-qt/qt5-addons/qtglesstream.bb
+++ b/recipes-qt/qt5-addons/qtglesstream.bb
@@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=e95d9351d26ed899188e02d44133cae0
 inherit qt5-module
 
 SRC_URI = " \
-    git://qt-gerrit.ci.local/QtRD-15810/qtglesstream.git;branch=${BRANCH};protocol=ssh \
+    git://codereview.qt-project.org/qt/tqtc-qtglesstream;branch=${BRANCH};protocol=ssh \
     "
 
 PV = "1.0.0"
diff --git a/recipes-qt/qt5-addons/qtquick2drenderer.bb b/recipes-qt/qt5-addons/qtquick2drenderer.bb
index 13b6b72..b57fc0b 100644
--- a/recipes-qt/qt5-addons/qtquick2drenderer.bb
+++ b/recipes-qt/qt5-addons/qtquick2drenderer.bb
@@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.
 inherit qt5-module sdk-sources
 
 SRC_URI = " \
-    git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \
+    git://codereview.qt-project.org/qt/tqtc-scenegraph-raster;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \
     "
 
 # v1.1.1
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
index 9c3d43b..6226e6e 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
+++ b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
@@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca
 inherit qt5-module
 
 SRC_URI = " \
-    git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;destsuffix=git \
+    git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \
     "
 
 # v3.0.0
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 7e0c0f9..8471c30 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -9,6 +9,7 @@
   <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
   <remote fetch="git://git.toradex.com" name="toradex"/>
   <remote fetch="git://github.com/architech-boards" name="architech"/>
+  <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
 
   <project name="poky"
            remote="yocto"
@@ -18,6 +19,10 @@
            remote="oe"
            revision="214e1801d0efc38d3b6142bdc0d8e58ca593e34c"
            path="sources/meta-openembedded"/>
+  <project name="meta-qt5"
+           remote="meta-qt5"
+           revision="51b4620392aa9041d8512549bfa554bea368c5ea"
+           path="sources/meta-qt5"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml
index 1c89e64..f146b2b 100644
--- a/scripts/manifest_fido.xml
+++ b/scripts/manifest_fido.xml
@@ -9,6 +9,7 @@
   <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
   <remote fetch="git://git.toradex.com" name="toradex"/>
   <remote fetch="git://github.com/architech-boards" name="architech"/>
+  <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
 
   <project name="poky"
            remote="yocto"
@@ -18,6 +19,10 @@
            remote="oe"
            revision="fido"
            path="sources/meta-openembedded"/>
+  <project name="meta-qt5"
+           remote="meta-qt5"
+           revision="master"
+           path="sources/meta-qt5"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
diff --git a/scripts/manifest_qt5.xml b/scripts/manifest_qt5.xml
deleted file mode 100644
index 1e4f902..0000000
--- a/scripts/manifest_qt5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-
-  <include name="manifest.xml"/>
-
-  <remote fetch="git://playground.ci.local" name="playground"/>
-
-  <project name="meta-qt5"
-           remote="playground"
-           revision="5.5.1"
-           path="sources/meta-qt5"/>
-
-</manifest>