summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-06-15 13:51:48 +0300
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-06-17 11:56:00 +0300
commit6d7941b077af9c2fd9ecefa67bc1bcab8f50a343 (patch)
tree295a68bc75f11b79827f2bf91759e573c2e81df4
parent0a103d9d54a53f0c6410f093857fd06f7755446b (diff)
downloadmeta-boot2qt-6d7941b077af9c2fd9ecefa67bc1bcab8f50a343.tar.gz
b2qt-demos: include qtcanvas3d planets demo
Change-Id: I86701ec160bcb0f90bb9d7ed22ec683ed7e261aa Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
-rw-r--r--recipes-qt/b2qt-addons/b2qt-demos.bb24
1 files changed, 19 insertions, 5 deletions
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index 8cc8116..6a05ca3 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -27,18 +27,20 @@ LIC_FILES_CHKSUM = "file://sensors/Accelbubble.qml;md5=1bf19846314f7b0fa81dc4db9
27inherit qmake5 27inherit qmake5
28 28
29SRC_URI = " \ 29SRC_URI = " \
30 git://qt-gerrit.ci.local/QtRD-15810/b2qt-demos;branch=${QT_BRANCH};protocol=ssh;name=demos \ 30 git://qt-gerrit.ci.local/QtRD-15810/b2qt-demos;branch=${BRANCH};protocol=ssh;name=demos \
31 git://code.qt.io/qt-labs/qt5-everywhere-demo.git;protocol=git;name=everywhere;destsuffix=qt5-everywhere-demo \ 31 git://code.qt.io/qt-labs/qt5-everywhere-demo.git;protocol=git;name=everywhere;destsuffix=qt5-everywhere-demo \
32 git://code.qt.io/qt/qtcanvas3d.git;branch=${QT_BRANCH};protocol=git;name=qtcanvas3d;destsuffix=qtcanvas3d \
32 " 33 "
33QT_BRANCH = "dev" 34BRANCH = "dev"
34SRCREV_demos = "d6979299a7809e5b832738c4cf39bba2c9a185eb" 35QT_BRANCH = "5.5.0"
36SRCREV_demos = "dcc6470466f8237cc46ac1ac39e865ec2568d702"
35SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e" 37SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e"
36GITDIR_everywhere = "${DL_DIR}/qt5-everywhere-demo" 38SRCREV_qtcanvas3d = "0f5e0a235e942e5b274fca7158ac179141014c0a"
37 39
38 40
39S = "${WORKDIR}/git/basicsuite" 41S = "${WORKDIR}/git/basicsuite"
40 42
41DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia \ 43DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia qtcanvas3d \
42 ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" 44 ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
43 45
44do_install_append() { 46do_install_append() {
@@ -55,6 +57,18 @@ do_install_append() {
55 # we can't have several top-level windows in b2qt, replace Window -> Rectangle 57 # we can't have several top-level windows in b2qt, replace Window -> Rectangle
56 sed -i '/import QtQuick.Window/c\' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml 58 sed -i '/import QtQuick.Window/c\' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml
57 sed -i 's/Window /Rectangle /1' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml 59 sed -i 's/Window /Rectangle /1' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml
60
61 cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/*.qml ${D}/data/user/qt/canvas3d-planets
62 cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/*.js ${D}/data/user/qt/canvas3d-planets
63 cp -r ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/images ${D}/data/user/qt/canvas3d-planets
64 cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/controls/ControlEventSource.qml ${D}/data/user/qt/canvas3d-planets
65 cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/3rdparty/*.js ${D}/data/user/qt/canvas3d-planets
66
67 # get rid of qrc:/ prefixes and the custom slider
68 sed -i 's/qrc:\(\/\)\?//g' ${D}/data/user/qt/canvas3d-planets/*.qml
69 sed -i 's/qrc:\(\/\)\?//g' ${D}/data/user/qt/canvas3d-planets/*.js
70 sed -i 's/StyledSlider/Slider/g' ${D}/data/user/qt/canvas3d-planets/planets.qml
71 sed -i '39 i import QtQuick.Controls 1.2' ${D}/data/user/qt/canvas3d-planets/planets.qml
58} 72}
59 73
60FILES_${PN} += " \ 74FILES_${PN} += " \