summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-10-02 09:59:20 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-10-04 05:50:14 +0000
commit893105e4e47cbd27362d2bb712518d047d40f947 (patch)
treeb7aec47dd1dc336258abe1d98a14f71d0cc87f78
parent2c947f7073bbf20e5a587b5d2b05f8b8298ef74d (diff)
downloadmeta-boot2qt-893105e4e47cbd27362d2bb712518d047d40f947.tar.gz
meta-qt5: update to 5.9.2 RC
* Update meta-qt5 layer to 5.9.2 RC * Keep qtsystems module in the old revision. Updating it requires lots of changes to emulator related recipes due API & other changes in qtsimulator module Change-Id: I679d8f45df474d8a14c989d51e0862255651e079 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/qtsystems_git.bbappend4
-rw-r--r--scripts/manifest.xml2
2 files changed, 4 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend
index 2a949eb..57c8285 100644
--- a/recipes-qt/qt5/qtsystems_git.bbappend
+++ b/recipes-qt/qt5/qtsystems_git.bbappend
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2017 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -29,3 +29,5 @@
29 29
30EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" 30EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator"
31DEPENDS_append_emulator = " qtsimulator" 31DEPENDS_append_emulator = " qtsimulator"
32
33SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 4de45d2..d2257ac 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="48da0529c59c245c53f982ebcc674750669b5979" 27 revision="d625f3f9776789543f7f5ff639fa7b663e228578"
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"