summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-09-08 08:25:03 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-09-27 07:22:03 +0000
commit6390f8f94ebe064f361d5aab1052404a3e7835be (patch)
treed3666549e6a9622402fb6a27ee9086fd03c4da4b
parentbb086957d285087b6345b44eb6e30381943af2d6 (diff)
downloadmeta-boot2qt-6390f8f94ebe064f361d5aab1052404a3e7835be.tar.gz
meta-qt5: update layer
- Pull in lots of commits from upstream/master - Update qtglesstream recipe to newer version to fix build break Change-Id: Icd3452fe11c572432f372df288456d688b6ba7fe Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5-addons/qtglesstream.bb2
-rw-r--r--scripts/manifest.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb
index 57eae88..bbf3d00 100644
--- a/recipes-qt/qt5-addons/qtglesstream.bb
+++ b/recipes-qt/qt5-addons/qtglesstream.bb
@@ -38,7 +38,7 @@ SRC_URI = " \
38 " 38 "
39 39
40PV = "1.0.0" 40PV = "1.0.0"
41SRCREV = "c11bf065f7630b7800dda157e4bc1aeba7a533d2" 41SRCREV = "114e5a1941f831d082395ed80a017f45d3b71a63"
42BRANCH = "dev" 42BRANCH = "dev"
43 43
44S = "${WORKDIR}/git" 44S = "${WORKDIR}/git"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 94c9b2a..660050b 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -24,7 +24,7 @@
24 path="sources/meta-openembedded"/> 24 path="sources/meta-openembedded"/>
25 <project name="meta-qt5" 25 <project name="meta-qt5"
26 remote="qtyocto" 26 remote="qtyocto"
27 revision="0010e434f6101edf47aadc6e58d27452570824ac" 27 revision="6269d8a5bc402e6dafd8ee8499481d29792d1c4a"
28 path="sources/meta-qt5"/> 28 path="sources/meta-qt5"/>
29 <project name="meta-mingw" 29 <project name="meta-mingw"
30 remote="qtyocto" 30 remote="qtyocto"