From f32773e4c9e2ef685b335a18cf5bb0ebe8dbee87 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 7 Feb 2019 10:27:09 +0200 Subject: 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 --- meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb | 8 ++++---- meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb | 4 ++-- meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb | 4 ++-- 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 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -42,11 +42,11 @@ SRC_URI = " \ https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \ " -PV = "5.12.1+git${SRCPV}" +PV = "5.13.0+git${SRCPV}" -BRANCH = "5.12" +BRANCH = "5.13" -SRCREV = "76322dd776d99367c8425f1bd116ad3dec66e52a" +SRCREV = "0ea39397893edb54454bfceabde4b83fc5b60a2e" SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da" SRC_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 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -43,7 +43,7 @@ SRC_URI += " \ file://ebikedata.service \ " -SRCREV = "64f65e26feb4f6b0b3ac31cfc4e22c5971c1c41d" +SRCREV = "747d70eaa865aad25b0ee680a0090c059a0549a9" DEPENDS = "\ 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 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -39,7 +39,7 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "9cd5fe081ff15d46802a90b5d19471091799f3e3" +SRCREV = "0b7e135bfbe8fbb40ec97ed1d643429418a93f61" DEPENDS = "\ qtbase qtdeclarative qtconnectivity qtdeclarative-native \ -- cgit v1.2.3-54-g00ecf