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

* origin/dizzy:
  qt5: all repos moved from qt-gerrit to codereview
  qt5: sync installed qt modules in image and toolchain
  qt5: use the upstream meta-qt5 layer
  qt5: add qt5-module.bbclass

Change-Id: I0d846be785acfd1e673eac8dbefe39ab2ef84cbb

3 files changed, 10 insertions, 13 deletions

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>