summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-08-23 16:08:44 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-08-24 08:40:26 +0000
commitfeac3edc2ab20b106e1f50f3401d60a2355f5178 (patch)
treed185225aa906ef53a6ccf80d91d61fea8e6c6dba
parentf533db349bef3c45cfbcdbdf527a8e73c39346b0 (diff)
downloadmeta-boot2qt-feac3edc2ab20b106e1f50f3401d60a2355f5178.tar.gz
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.bb20
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 f21eb39..65bca6e 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 = " \
41 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ 41 https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
42 " 42 "
43 43
44PV = "5.11.1+git${SRCPV}" 44PV = "5.11.2+git${SRCPV}"
45 45
46BRANCH = "5.11" 46BRANCH = "5.11"
47BROWSER_BRANCH = "dev"
48 47
49SRCREV = "a60eb6782491ca42dd9139ad0a14866cdf064d40" 48SRCREV = "3594ea2a2dec8a74c2e8baf307c13671ebbdf18c"
50 49
51SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b" 50SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b"
52SRC_URI[video1.sha256sum] = "809123419acac99353439e52c870e2e497dfa8f434ef0777e6c7303e6ad27f89" 51SRC_URI[video1.sha256sum] = "809123419acac99353439e52c870e2e497dfa8f434ef0777e6c7303e6ad27f89"
@@ -88,21 +87,6 @@ do_install_append() {
88 install -d -m 0755 ${D}/data/videos 87 install -d -m 0755 ${D}/data/videos
89 install -m 0644 ${WORKDIR}/Qt_video_720p.webm ${D}/data/videos 88 install -m 0644 ${WORKDIR}/Qt_video_720p.webm ${D}/data/videos
90 install -m 0644 ${WORKDIR}/Qt+World+Summit+2015+Recap.mp4 ${D}/data/videos 89 install -m 0644 ${WORKDIR}/Qt+World+Summit+2015+Recap.mp4 ${D}/data/videos
91
92 # Common settings
93 cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/enterprise-charts/
94 cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/graphicaleffects/
95 cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/mediaplayer/
96
97 # Image paths
98 sed -i 's#arrow.png#images/arrow.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml
99 sed -i 's#qt-logo.png#images/qt-logo.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml
100 sed -i 's#back.png#icons/gallery/20x20/back.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml
101 sed -i 's#drawer.png#icons/gallery/20x20/drawer.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml
102 sed -i 's#menu.png#icons/gallery/20x20/menu.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml
103
104 # Page references (source: "SomePage.qml" -> source: "pages/SomePage.qml")
105 sed -i 's#source: \"\(.*\)Page.qml#source: \"pages/\1Page.qml#' ${D}/data/user/qt/qtquickcontrols2/main.qml
106} 90}
107 91
108FILES_${PN} += " \ 92FILES_${PN} += " \