From 49da63424ecb059d00a64ed45d89a98dabcf0af3 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 13 Sep 2018 15:41:19 +0300 Subject: boot2qt addons: update demos, launcher & deviceutilities revisions Update boot2qt addon modules to latest versions: - Minor fixes & tweaks to all modules - Qt3D demo added to launcher Change-Id: Id5234dc5c0e202bdfcfeda934c359c930ab32226 Reviewed-by: Kari Oikarinen --- meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb | 7 ++++--- meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb | 2 +- meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'meta-boot2qt') 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 3900abb..16725f2 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb @@ -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.11.2+git${SRCPV}" +PV = "5.12.0+git${SRCPV}" -BRANCH = "5.11" +BRANCH = "5.12" -SRCREV = "ca03367f33d6430d3ddbbd70edf832bced59ff74" +SRCREV = "b12865b21e3f950e417fcab6c03fbcb6cefbbd10" SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da" SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a" @@ -70,6 +70,7 @@ do_install_append() { rm -rf ${D}/data/user/qtwebbrowser # we need all qml and content files from the demos we want to use + cp -r ${S}/advancedcustommaterial ${D}/data/user/qt/ cp -r ${S}/datacollector ${D}/data/user/qt/ cp -r ${S}/ebike-ui ${D}/data/user/qt/ cp -r ${S}/enterprise-charts ${D}/data/user/qt/ 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 cda1ac7..6c50094 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb @@ -43,7 +43,7 @@ SRC_URI += " \ file://ebikedata.service \ " -SRCREV = "ce4d3833f5193168fb61392d08f61e73997632eb" +SRCREV = "cd36ba030e95688c453873df5b391a5f847d562a" 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 6313c5c..e3f3fb2 100644 --- a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb +++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb @@ -39,7 +39,7 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "0ecd391912f6338d5aef6105600fc8c321c83bd8" +SRCREV = "59405866644db41b866bdb561fe8ad2a1892f73b" DEPENDS = "\ qtbase qtdeclarative qtconnectivity qtdeclarative-native \ -- cgit v1.2.3-54-g00ecf