summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-06-13 08:42:52 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-08-11 07:14:08 +0000
commitd7d6fcb2da15e49ad42b119f50b58a35c4b6498e (patch)
tree3f43cdf7432ca9f7cb381db6fb657338d1b65fd7 /scripts
parentaf576e137e0aa8bde0e6b4fcb8b4011fa0769277 (diff)
downloadmeta-boot2qt-d7d6fcb2da15e49ad42b119f50b58a35c4b6498e.tar.gz
qt5: update meta-qt5
* Include merged upstream/krogoth content * Include first 5.6.3 submodule update snapshot * Use meta-qt5 submodule SHA1s directly instead of meta-boot2qt overrides * Clean obsolete/overlapping content from .bbappends Change-Id: I3ae72197a64f67c1856210a45f5e49331e1cc03d Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/manifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 973aa69..1894f64 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -11,6 +11,7 @@
11 <remote fetch="git://github.com/architech-boards" name="architech"/> 11 <remote fetch="git://github.com/architech-boards" name="architech"/>
12 <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> 12 <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
13 <remote fetch="git://code.qt.io/yocto" name="qtyocto"/> 13 <remote fetch="git://code.qt.io/yocto" name="qtyocto"/>
14 <remote fetch="ssh://codereview.qt-project.org/yocto" name="gerrit"/>
14 <remote fetch="git://git.yoctoproject.org" name="intel"/> 15 <remote fetch="git://git.yoctoproject.org" name="intel"/>
15 <remote fetch="git://github.com/openembedded" name="oe-mirror"/> 16 <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
16 <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/> 17 <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
@@ -25,7 +26,7 @@
25 path="sources/meta-openembedded"/> 26 path="sources/meta-openembedded"/>
26 <project name="meta-qt5" 27 <project name="meta-qt5"
27 remote="qtyocto" 28 remote="qtyocto"
28 revision="8d3770b5fe81d13212d84151664ceb080fc60302" 29 revision="b72dbdfcb6e1e3c520de216cda4d0893d6372bd2"
29 path="sources/meta-qt5"/> 30 path="sources/meta-qt5"/>
30 <project name="meta-mingw" 31 <project name="meta-mingw"
31 remote="qtyocto" 32 remote="qtyocto"