summaryrefslogtreecommitdiffstats
path: root/meta-boot2qt/recipes-qt
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2018-05-21 16:24:54 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2018-05-21 13:28:54 +0000
commitbbeff89ae4d0ae01b036b8d8daa8c5c2a97a5e86 (patch)
treebbfb612714a8ccf27cd1656eba16d85e48131b0c /meta-boot2qt/recipes-qt
parentf32d6ab4d635f8d1df41ed343873f4dfa0ae8375 (diff)
downloadmeta-boot2qt-bbeff89ae4d0ae01b036b8d8daa8c5c2a97a5e86.tar.gz
Copy shared settings file to each demo needing themv5.11.0
Relative paths are not compatible between boot2qt launcher and QtCreator examples. Change-Id: Icc4df0c69634b5d293d0213e08c0b2cdbecd6660 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt/recipes-qt')
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb7
1 files changed, 3 insertions, 4 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 385750e..0c1f142 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
@@ -85,10 +85,9 @@ do_install_append() {
85 install -m 0644 ${WORKDIR}/Qt+World+Summit+2015+Recap.mp4 ${D}/data/videos 85 install -m 0644 ${WORKDIR}/Qt+World+Summit+2015+Recap.mp4 ${D}/data/videos
86 86
87 # Common settings 87 # Common settings
88 sed -i 's#settings.js#../../shared/settings.js#' \ 88 cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/enterprise-charts/
89 ${D}/data/user/qt/enterprise-charts/*.qml \ 89 cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/graphicaleffects/
90 ${D}/data/user/qt/graphicaleffects/*.qml \ 90 cp ${D}/data/user/qt/shared/settings.js ${D}/data/user/qt/mediaplayer/
91 ${D}/data/user/qt/mediaplayer/*.qml
92 91
93 # Image paths 92 # Image paths
94 sed -i 's#arrow.png#images/arrow.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml 93 sed -i 's#arrow.png#images/arrow.png#' ${D}/data/user/qt/qtquickcontrols2/*.qml