From 164559d913163c68bc818e28197abe73a953cdf8 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 20 Mar 2018 15:22:40 +0200 Subject: boot2qt-demos: update all modules to latest in 5.11 branch Includes a few typo fixes & other minor things. The current SHA1s are from 5.6/5.7 era, refreshing these as a generic cleanup of recipes. Task-number: QTBUG-67205 Change-Id: I2f3938526dec1922ee6fc4a43817ce8b77df0331 Reviewed-by: Samuli Piippo --- .../recipes-qt/boot2qt-addons/boot2qt-demos_git.bb | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 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 3726482..e8b97c3 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb @@ -37,8 +37,8 @@ QT_GIT_PROJECT="" SRC_URI = " \ ${QT_GIT}qt-apps/boot2qt-demos.git;branch=${BRANCH};name=demos \ - ${QT_GIT}qt/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ - ${QT_GIT}qt/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ + ${QT_GIT}qt/qtcanvas3d.git;branch=${BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ + ${QT_GIT}qt/qtquickcontrols.git;branch=${BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ ${QT_GIT}qt-apps/qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/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 \ @@ -46,13 +46,13 @@ SRC_URI = " \ PV = "5.11.0+git${SRCPV}" -BRANCH = "5.10" +BRANCH = "5.11" BROWSER_BRANCH = "dev" -QT_BRANCH = "5.10" -SRCREV_demos = "f9c7da64cea85d44998e62f4e0d3ec217a22f0d2" -SRCREV_qtcanvas3d = "32404e27101c5ec81b4ab965faf38263429bbc5a" -SRCREV_qtquickcontrols = "c6713e212ef0b97c45d6466b73220567e94a05f1" -SRCREV_qtwebbrowser = "7c570ee4297946f3ed70565a630d690070533cbd" + +SRCREV_demos = "0909f9baabc446e4a7bb85593e39fad474af88ab" +SRCREV_qtcanvas3d = "80d7f92b9628076b681e509ddf8eae43cac550d5" +SRCREV_qtquickcontrols = "710058343297bba7cc44fa2369b7cec742f34cb2" +SRCREV_qtwebbrowser = "09d629199fa153ea7954321d81f647d5eb52fb6c" SRCREV_FORMAT = "demos_qtcanvas3d_qtquickcontrols_qtwebbrowser" SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b" @@ -88,11 +88,11 @@ do_install_append() { install -m 0644 ${WORKDIR}/Qt_video_720p.webm ${D}/data/videos install -m 0644 ${WORKDIR}/Qt+World+Summit+2015+Recap.mp4 ${D}/data/videos - cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/*.qml ${D}/data/user/qt/canvas3d-planets - cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/*.js ${D}/data/user/qt/canvas3d-planets - cp -r ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/images ${D}/data/user/qt/canvas3d-planets - cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/controls/ControlEventSource.qml ${D}/data/user/qt/canvas3d-planets - cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/3rdparty/*.js ${D}/data/user/qt/canvas3d-planets + cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/threejs/planets/*.qml ${D}/data/user/qt/canvas3d-planets + cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/threejs/planets/*.js ${D}/data/user/qt/canvas3d-planets + cp -r ${WORKDIR}/qtcanvas3d/examples/canvas3d/threejs/planets/images ${D}/data/user/qt/canvas3d-planets + cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/threejs/controls/ControlEventSource.qml ${D}/data/user/qt/canvas3d-planets + cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/3rdparty/*.js ${D}/data/user/qt/canvas3d-planets # get rid of qrc:/ prefixes and the custom slider sed -i 's/qrc:\(\/\)\?//g' ${D}/data/user/qt/canvas3d-planets/*.qml -- cgit v1.2.3-54-g00ecf