diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-18 15:21:46 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-26 12:39:12 +0000 |
| commit | e794cd92f9f6cfe6334a55974f433de6ea743c15 (patch) | |
| tree | 9ebb6176be3c0f02e9f216088f36e8344b0e206a | |
| parent | a072acdafd305facd7961c85ddae345ac534682d (diff) | |
boot2qt-demos: update & cleanup recipe
- Update to latest version, including UI fixes for mediaplayer
- Remove obsolete qtwebbrowser SRC_URI, as browser is now part of
demos repo under basicsuite folder instead of submodule
- Add only currently used demo content to image
Task-number: QTBUG-68978
Task-number: QTBUG-62791
Task-number: QTBUG-68674
Task-number: QTBUG-68471
Change-Id: I78353321ec0485111a5d7bc0fb3088048eb8ec50
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb | 24 |
1 files changed, 13 insertions, 11 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 3c1142a6..de87a1a6 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb @@ -37,7 +37,6 @@ QT_GIT_PROJECT="" SRC_URI = " \ ${QT_GIT}qt-apps/boot2qt-demos.git;branch=${BRANCH};name=demos \ - ${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 \ " @@ -47,9 +46,7 @@ PV = "5.11.1+git${SRCPV}" BRANCH = "5.11" BROWSER_BRANCH = "dev" -SRCREV_demos = "a60797871ea11ade6b583869e361ffef88e2213b" -SRCREV_qtwebbrowser = "09d629199fa153ea7954321d81f647d5eb52fb6c" -SRCREV_FORMAT = "demos_qtwebbrowser" +SRCREV = "cc9de3791859538441fc5a174c69f556638cce03" SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b" SRC_URI[video1.sha256sum] = "809123419acac99353439e52c870e2e497dfa8f434ef0777e6c7303e6ad27f89" @@ -67,19 +64,24 @@ do_install_append() { rm -rf ${D}/data/user/sensorexplorer rm -rf ${D}/data/user/qtwebbrowser - # we need all qml and content files - cp -r ${S}/* ${D}/data/user/qt/ + # we need all qml and content files from the demos we want to use + 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/ + cp -r ${S}/graphicaleffects ${D}/data/user/qt/ + cp -r ${S}/launchersettings ${D}/data/user/qt/ + cp -r ${S}/mediaplayer ${D}/data/user/qt/ + cp -r ${S}/qtquickcontrols2 ${D}/data/user/qt/ + cp -r ${S}/textinput ${D}/data/user/qt/ + cp -r ${S}/shared ${D}/data/user/qt/ + cp -r ${S}/qtwebbrowser ${D}/data/user/qt/ + cp ${S}/demos.xml ${D}/data/user/qt/ # but none of the source files find ${D}/data/user/qt/ \( -name '*.cpp' -or -name '*.h' -or -name '*.pro' \) -delete rm -rf ${D}/data/user/qt/qtwebbrowser/tqtc-qtwebbrowser rm -rf ${D}/data/user/qt/qtwebbrowser/qmldir - if [ -d ${WORKDIR}/git/images ]; then - install -d 0755 ${D}/data/images - install -m 0644 ${WORKDIR}/git/images/* ${D}/data/images/ - fi - install -d -m 0755 ${D}/data/videos install -m 0644 ${WORKDIR}/Qt_video_720p.webm ${D}/data/videos install -m 0644 ${WORKDIR}/Qt+World+Summit+2015+Recap.mp4 ${D}/data/videos |