diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-08-23 16:08:44 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-08-24 08:40:26 +0000 |
| commit | feac3edc2ab20b106e1f50f3401d60a2355f5178 (patch) | |
| tree | d185225aa906ef53a6ccf80d91d61fea8e6c6dba | |
| parent | f533db349bef3c45cfbcdbdf527a8e73c39346b0 (diff) | |
boot2qt-demos: no need to patch demos anymore
Update revision and remove unneeded patching of the sources.
Task-number: QTBUG-69950
Change-Id: I406483d4e9a7f9eea1e932e9d176d72398f14860
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb | 20 |
1 files changed, 2 insertions, 18 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 f21eb396..65bca6e7 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb @@ -41,12 +41,11 @@ SRC_URI = " \ https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ " -PV = "5.11.1+git${SRCPV}" +PV = "5.11.2+git${SRCPV}" BRANCH = "5.11" -BROWSER_BRANCH = "dev" -SRCREV = "a60eb6782491ca42dd9139ad0a14866cdf064d40" +SRCREV = "3594ea2a2dec8a74c2e8baf307c13671ebbdf18c" SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b" SRC_URI[video1.sha256sum] = "809123419acac99353439e52c870e2e497dfa8f434ef0777e6c7303e6ad27f89" @@ -88,21 +87,6 @@ do_install_append() { 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 - - # Common settings - cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/enterprise-charts/ - cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/graphicaleffects/ - cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/mediaplayer/ - - # Image paths - sed -i 's#arrow.png#images/arrow.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml - sed -i 's#qt-logo.png#images/qt-logo.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml - sed -i 's#back.png#icons/gallery/20x20/back.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml - sed -i 's#drawer.png#icons/gallery/20x20/drawer.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml - sed -i 's#menu.png#icons/gallery/20x20/menu.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml - - # Page references (source: "SomePage.qml" -> source: "pages/SomePage.qml") - sed -i 's#source: \"\(.*\)Page.qml#source: \"pages/\1Page.qml#' ${D}/data/user/qt/qtquickcontrols2/main.qml } FILES_${PN} += " \ |