From 4157cb42693171cb4f8e47752393a240461f7efa Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Thu, 15 Oct 2015 12:57:05 +0300
Subject: qt5: oe-device-extra.pri is now supported in upstream

Use of oe-device-extra.pri was merged upstream, so remove unneeded
parts for our layer.

Change-Id: I40ffeadc80780d49ba777e7cfd24fc2048d3a418
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 scripts/manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index acdbe21..e1e7e4c 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -21,7 +21,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="meta-qt5"
-           revision="51b4620392aa9041d8512549bfa554bea368c5ea"
+           revision="89038bffd224a0d43aa8627472374503b3023f61"
            path="sources/meta-qt5"/>
 
   <project name="meta-fsl-arm"
-- 
cgit v1.2.3-54-g00ecf


From 83920dd4c1562be44bb16d070db0224393540790 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Wed, 28 Oct 2015 14:52:03 +0200
Subject: qt5: use jethro branch for meta-qt5

meta-qt5 master branch is moving to Qt 5.6, so use jethro branch
to stay with Qt 5.5.

Change-Id: I71fcb18b15962a4d9da4a82899203ef4ab66cc03
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 scripts/manifest_dizzy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_dizzy.xml
index bdd936a..fd397e9 100644
--- a/scripts/manifest_dizzy.xml
+++ b/scripts/manifest_dizzy.xml
@@ -21,7 +21,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="meta-qt5"
-           revision="master"
+           revision="jethro"
            path="sources/meta-qt5"/>
 
   <project name="meta-fsl-arm"
-- 
cgit v1.2.3-54-g00ecf