diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-16 15:43:26 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-17 12:20:59 +0300 |
commit | e11d78a554a184767383758185a3902e4d6c986d (patch) | |
tree | 08a47c7751a04750c03640dfba99c41ddd5485b1 /recipes-qt/b2qt-addons/b2qt-demos.bb | |
parent | 6d7941b077af9c2fd9ecefa67bc1bcab8f50a343 (diff) | |
download | meta-boot2qt-e11d78a554a184767383758185a3902e4d6c986d.tar.gz |
Support BYOS for enterprise only addons
When QT_SDK_PATH has been set, use sources for all enterprise addons
from the SDK installation path. This allows customers to build enterprise
only addos and b2qt addons without access to qt-gerrit.
Change-Id: I66ad8a2ff81628333ba7dd6042659c3fa220be8c
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'recipes-qt/b2qt-addons/b2qt-demos.bb')
-rw-r--r-- | recipes-qt/b2qt-addons/b2qt-demos.bb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 6a05ca3..c262b65 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb | |||
@@ -24,13 +24,14 @@ DESCRIPTION = "Boot to Qt Demos" | |||
24 | LICENSE = "QtEnterprise" | 24 | LICENSE = "QtEnterprise" |
25 | LIC_FILES_CHKSUM = "file://sensors/Accelbubble.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40" | 25 | LIC_FILES_CHKSUM = "file://sensors/Accelbubble.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40" |
26 | 26 | ||
27 | inherit qmake5 | 27 | inherit qmake5 sdk-sources |
28 | 28 | ||
29 | SRC_URI = " \ | 29 | SRC_URI = " \ |
30 | git://qt-gerrit.ci.local/QtRD-15810/b2qt-demos;branch=${BRANCH};protocol=ssh;name=demos \ | 30 | git://qt-gerrit.ci.local/QtRD-15810/b2qt-demos;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.5/Boot2Qt/sources/b2qt-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 | git://code.qt.io/qt/qtcanvas3d.git;branch=${QT_BRANCH};protocol=git;name=qtcanvas3d;destsuffix=qtcanvas3d \ |
33 | " | 33 | " |
34 | |||
34 | BRANCH = "dev" | 35 | BRANCH = "dev" |
35 | QT_BRANCH = "5.5.0" | 36 | QT_BRANCH = "5.5.0" |
36 | SRCREV_demos = "dcc6470466f8237cc46ac1ac39e865ec2568d702" | 37 | SRCREV_demos = "dcc6470466f8237cc46ac1ac39e865ec2568d702" |
@@ -49,8 +50,12 @@ do_install_append() { | |||
49 | rm -rf ${D}/data/user/sensorexplorer | 50 | rm -rf ${D}/data/user/sensorexplorer |
50 | 51 | ||
51 | cp -r ${S}/* ${D}/data/user/qt/ | 52 | cp -r ${S}/* ${D}/data/user/qt/ |
52 | cp -r ${S}/../images ${D}/data/ | 53 | if [ -d ${S}/../images ]; then |
53 | cp -r ${S}/../videos ${D}/data/ | 54 | cp -r ${S}/../images ${D}/data/ |
55 | fi | ||
56 | if [ -d ${S}/../videos ]; then | ||
57 | cp -r ${S}/../videos ${D}/data/ | ||
58 | fi | ||
54 | 59 | ||
55 | cp -r ${WORKDIR}/qt5-everywhere-demo/QtDemo/qml ${D}/data/user/qt/qt5-everywhere/ | 60 | cp -r ${WORKDIR}/qt5-everywhere-demo/QtDemo/qml ${D}/data/user/qt/qt5-everywhere/ |
56 | 61 | ||