summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-09-06 10:40:12 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-09-06 08:51:24 +0000
commited8025ddac5f22330f572fa076431ac22465e9d3 (patch)
tree856b575f8c68568884bf6208a100355ceefa3ccd
parente19a98fcaec0d2ca794419cfd1d5cfd2225b4962 (diff)
downloadmeta-boot2qt-ed8025ddac5f22330f572fa076431ac22465e9d3.tar.gz
b2qt: Update B2Qt specific modules
QtDeviceutilities, B2Qt-Demos & B2Qt-Launcher SHA1s updated to 5.10 branch. Change-Id: Iffdaed5db74c8567f978a1444b03f740899b1c17 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/b2qt-addons/b2qt-demos.bb10
-rw-r--r--recipes-qt/b2qt-addons/b2qt-launcher.bb4
-rw-r--r--recipes-qt/qt5/qtdeviceutilities.bb2
3 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index f133352..d1861a3 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -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.
@@ -44,12 +44,12 @@ SRC_URI = " \
44 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ 44 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
45 " 45 "
46 46
47PV = "5.7+git${SRCPV}" 47PV = "5.10.0+git${SRCPV}"
48 48
49BRANCH = "5.7" 49BRANCH = "5.10"
50BROWSER_BRANCH = "dev" 50BROWSER_BRANCH = "dev"
51QT_BRANCH = "5.7" 51QT_BRANCH = "5.10"
52SRCREV_demos = "cd9f0c40f30226c7ce1c3259aea8ebca08acfbb8" 52SRCREV_demos = "55ce120e6ceccb40f19a941fbda05edefd22d64c"
53SRCREV_qtcanvas3d = "32404e27101c5ec81b4ab965faf38263429bbc5a" 53SRCREV_qtcanvas3d = "32404e27101c5ec81b4ab965faf38263429bbc5a"
54SRCREV_qtquickcontrols = "c6713e212ef0b97c45d6466b73220567e94a05f1" 54SRCREV_qtquickcontrols = "c6713e212ef0b97c45d6466b73220567e94a05f1"
55SRCREV_qtwebbrowser = "7c570ee4297946f3ed70565a630d690070533cbd" 55SRCREV_qtwebbrowser = "7c570ee4297946f3ed70565a630d690070533cbd"
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index 32f569b..691fb97 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -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.
@@ -43,7 +43,7 @@ SRC_URI += " \
43 file://b2qt.service \ 43 file://b2qt.service \
44 " 44 "
45 45
46SRCREV = "7ff96b74f8721dbaf50722561770815a4530b6a0" 46SRCREV = "d2ec2dc7034c31e3602003b55d5f2a2c98983651"
47 47
48DEPENDS = "qtbase qtdeclarative \ 48DEPENDS = "qtbase qtdeclarative \
49 ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" 49 ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb
index 3b8f18c..2a9e2b0 100644
--- a/recipes-qt/qt5/qtdeviceutilities.bb
+++ b/recipes-qt/qt5/qtdeviceutilities.bb
@@ -43,6 +43,6 @@ SRC_URI = " \
43 git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \ 43 git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \
44 " 44 "
45 45
46SRCREV = "43e4b847851afc5d00664a9e88ef825ca9fedd02" 46SRCREV = "a9e073646307469b5373a0b0ebef36fcf3b59953"
47 47
48DEPENDS = "qtbase qtdeclarative qtconnectivity" 48DEPENDS = "qtbase qtdeclarative qtconnectivity"