Use 5.7 branch for b2qt addons

Use latest versions from 5.7 branches and update the sdk-source paths Change-Id: I8a37b7c627d92f1856d4ec5f7fa1d66891d7280e Task-number: QTBUG-53287 Reviewed-by: Kimmo Ollila <[email protected]>
TimesysGit · May 12, 2016 · 1944b64 · 1944b64
1 parent 5cd551d
commit 1944b64
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 27 deletions.
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -26,13 +26,13 @@ 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.6/Boot2Qt/sources/b2qt-appcontroller/ \
+    git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-appcontroller/ \
     file://appcontroller.conf \
     "
 
 SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28"
-BRANCH = "5.6"
-PV = "5.6+git${SRCPV}"
+BRANCH = "5.7"
+PV = "5.7+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 

diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -21,28 +21,28 @@
 
 DESCRIPTION = "Boot to Qt Demos"
 LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40"
+LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginline=1;endline=49"
 
 inherit qmake5 sdk-sources
 
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/demos.git;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos \
+    git://codereview.qt-project.org/tqtc-boot2qt/demos.git;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos \
     ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \
     ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \
-    git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=ssh;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
+    git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=ssh;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
     https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \
     https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
     "
 
-PV = "5.6+git${SRCPV}"
+PV = "5.7+git${SRCPV}"
 
-BRANCH = "5.6"
+BRANCH = "5.7"
 BROWSER_BRANCH = "dev"
-QT_BRANCH = "5.6"
-SRCREV_demos = "1e2d7ade9c4bb6bee6aca8f716844b4d66d6b033"
-SRCREV_qtcanvas3d = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18"
-SRCREV_qtquickcontrols = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df"
-SRCREV_qtwebbrowser = "c86bb8a400f79be205025598310926df5d01c7bc"
+QT_BRANCH = "5.7"
+SRCREV_demos = "307b6bec8b73f780a14b13f8dccf0f2cb79bc63c"
+SRCREV_qtcanvas3d = "32404e27101c5ec81b4ab965faf38263429bbc5a"
+SRCREV_qtquickcontrols = "2ee6ef43d681746d07c1175738184715ce0d84e4"
+SRCREV_qtwebbrowser = "7c570ee4297946f3ed70565a630d690070533cbd"
 SRCREV_FORMAT = "demos_qtcanvas3d_qtquickcontrols_qtwebbrowser"
 
 SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b"

diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -21,20 +21,20 @@
 
 DESCRIPTION = "Boot to Qt Demo Launcher"
 LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17"
+LIC_FILES_CHKSUM = "file://src/main.cpp;md5=9320b0d61b46bdd5f27afcc40a0ad77f;beginline=1;endline=17"
 
 inherit qmake5 sdk-sources
 
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/launcher;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-launcher \
+    git://codereview.qt-project.org/tqtc-boot2qt/launcher;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-launcher \
     file://b2qt-startup.sh \
     file://qtlauncher.service \
     file://b2qt.service \
     "
 
-SRCREV = "f5aaf9297648b397ee8fecb0a494b4774e130422"
-BRANCH = "5.6"
-PV = "5.6+git${SRCPV}"
+SRCREV = "1cf3f43163f38d9a00415b61777ecb71f989fe1a"
+BRANCH = "5.7"
+PV = "5.7+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 

diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb
@@ -21,23 +21,21 @@
 
 DESCRIPTION = "Boot to Qt Wayland Demo Compositor"
 LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://main.cpp;md5=56e7f80d726792929d5d089852de7cde;beginline=1;endline=39"
+LIC_FILES_CHKSUM = "file://main.cpp;md5=9fab217254862959183461343b99a1ab;beginline=1;endline=39"
 
 inherit qmake5 sdk-sources
 
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/demos;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos \
+    git://codereview.qt-project.org/tqtc-boot2qt/demos;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos \
     "
 
-SRCREV = "b6217fb2bb7702324da2a9f3f45be4a60e6ffe6c"
-BRANCH = "5.6"
-PV = "5.6+git${SRCPV}"
+SRCREV = "307b6bec8b73f780a14b13f8dccf0f2cb79bc63c"
+BRANCH = "5.7"
+PV = "5.7+git${SRCPV}"
 
 S = "${WORKDIR}/git/wayland/democompositor/"
 
 DEPENDS = "qtbase qtwayland"
 
-do_install_append() {
-    install -d -m0775 ${D}/usr/bin
-    install -m0775 ${B}/democompositor ${D}/usr/bin
-}
+FILES_${PN} += "/data/user/democompositor"
+FILES_${PN}-dbg += "/data/user/democompositor/.debug"