summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-02-07 10:27:09 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-02-07 11:41:31 +0000
commitf32773e4c9e2ef685b335a18cf5bb0ebe8dbee87 (patch)
treec25b84b2e9f7ea54ce09531d44af92daca5c6ad6
parentafaeb8bec1eafd0ff29a85d399476af0a9000943 (diff)
downloadmeta-boot2qt-f32773e4c9e2ef685b335a18cf5bb0ebe8dbee87.tar.gz
boot2qt-addons, qtdeviceutilities: update to latest revisions
* Merges from 5.12 branch for all modules * Enable boot2qt launcher automatic demo mode * Launcher code cleanup Change-Id: Ifdfa81e117984781634c299f075041d36b4834fc Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb8
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb4
-rw-r--r--meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb4
3 files changed, 8 insertions, 8 deletions
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
index c1960ec..8c0237b 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2018 The Qt Company Ltd. 3## Copyright (C) 2019 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.
@@ -42,11 +42,11 @@ SRC_URI = " \
42 https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \ 42 https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \
43 " 43 "
44 44
45PV = "5.12.1+git${SRCPV}" 45PV = "5.13.0+git${SRCPV}"
46 46
47BRANCH = "5.12" 47BRANCH = "5.13"
48 48
49SRCREV = "76322dd776d99367c8425f1bd116ad3dec66e52a" 49SRCREV = "0ea39397893edb54454bfceabde4b83fc5b60a2e"
50 50
51SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da" 51SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da"
52SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a" 52SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
index 9575045..e067b57 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2018 The Qt Company Ltd. 3## Copyright (C) 2019 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://ebikedata.service \ 43 file://ebikedata.service \
44 " 44 "
45 45
46SRCREV = "64f65e26feb4f6b0b3ac31cfc4e22c5971c1c41d" 46SRCREV = "747d70eaa865aad25b0ee680a0090c059a0549a9"
47 47
48DEPENDS = "\ 48DEPENDS = "\
49 qtbase qtdeclarative qtquickcontrols2 \ 49 qtbase qtdeclarative qtquickcontrols2 \
diff --git a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
index cba3881..de2931e 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2018 The Qt Company Ltd. 3## Copyright (C) 2019 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.
@@ -39,7 +39,7 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant"
39 39
40EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 40EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
41 41
42SRCREV = "9cd5fe081ff15d46802a90b5d19471091799f3e3" 42SRCREV = "0b7e135bfbe8fbb40ec97ed1d643429418a93f61"
43 43
44DEPENDS = "\ 44DEPENDS = "\
45 qtbase qtdeclarative qtconnectivity qtdeclarative-native \ 45 qtbase qtdeclarative qtconnectivity qtdeclarative-native \