qt5: use the upstream meta-qt5 layer

all the necessary changes are merged to upstream meta-qt5 layer,
so we can start using it.

Change-Id: I1b0289a59dd734acd80ba61d946531024716f927
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

3 files changed, 10 insertions, 13 deletions

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 4a88a1b..acdbe21 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="5b6f39ce325d490fc382d5d59c5b8b9d5fa38b38"
            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_dizzy.xml b/scripts/manifest_dizzy.xml
index d6fdd0b..bdd936a 100644
--- a/scripts/manifest_dizzy.xml
+++ b/scripts/manifest_dizzy.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="dizzy"
            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>