From d9c6a8312012d6b460fa13b52b238ab44b65c9c5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 26 Jan 2016 12:25:02 +0200 Subject: Update SRCREVs for b2qt addons Change-Id: I011075a6370d1ad46c90b72e7e42b39367d4d630 Reviewed-by: Teemu Holappa --- recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 6 +++--- recipes-qt/b2qt-addons/b2qt-demos.bb | 9 ++++++--- recipes-qt/b2qt-addons/b2qt-launcher.bb | 2 +- recipes-qt/b2qt-addons/b2qt-utils.bb | 8 ++++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index ef7108f..939c60c 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb @@ -27,12 +27,12 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginli inherit qmake5 sdk-sources SRC_URI = " \ - git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-appcontroller/ \ + git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-appcontroller/ \ file://appcontroller.conf \ " -SRCREV = "7ac47bee4c6bd55df8c0cad14ff11457fbf07158" -BRANCH = "5.5" +SRCREV = "af3ab8ec0213a40d90f3d58a8a65a944b0cd753e" +BRANCH = "5.6" S = "${WORKDIR}/git" diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 62fb93a..02d1a99 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -22,7 +22,7 @@ DESCRIPTION = "Boot to Qt Demos" LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://sensors/Accelbubble.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40" +LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40" inherit qmake5 sdk-sources @@ -35,13 +35,16 @@ SRC_URI = " \ https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ " -BRANCH = "dev" +PV = "1.0+git${SRCPV}" + +BRANCH = "5.6" BROWSER_BRANCH = "dev" QT_BRANCH = "5.6" -SRCREV_demos = "eb0d282260db6f03b299029c52a73d203cc16786" +SRCREV_demos = "07f1279e26d4cce5206b9364407aafb312b47fce" SRCREV_qtcanvas3d = "bb1504c271e18a26ad6ac20d55485c167671b1c2" SRCREV_qtquickcontrols = "5a992a14da4334364d81ad8d9e0b270ad0bb370d" SRCREV_qtwebbrowser = "60a8ef724c11c35413d42ef1ccd118e9c4f6c3c9" +SRCREV_FORMAT = "demos_qtcanvas3d_qtquickcontrols_qtwebbrowser" SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b" SRC_URI[video1.sha256sum] = "809123419acac99353439e52c870e2e497dfa8f434ef0777e6c7303e6ad27f89" diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 66d17a8..c16cdef 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -34,7 +34,7 @@ SRC_URI = " \ " SRCREV = "81c95946aec152090810da6218ef8d33963368a6" -BRANCH = "dev" +BRANCH = "5.6" S = "${WORKDIR}/git" diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb index 81a5b60..7b0b721 100644 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ b/recipes-qt/b2qt-addons/b2qt-utils.bb @@ -22,16 +22,16 @@ DESCRIPTION = "Boot to Qt Utils module" LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://src/qconnectivity/main.cpp;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17" +LIC_FILES_CHKSUM = "file://src/wifi/qwifimanager.h;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17" inherit qt5-module sdk-sources SRC_URI = " \ - git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-utils \ + git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-utils \ " -SRCREV = "ae6f34543b8336ad5a202916ee42a2d2bd00bfe7" -BRANCH = "5.5" +SRCREV = "2b81f8dbc97b446b33fb67e3196a8726ed195008" +BRANCH = "5.6" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf