summaryrefslogtreecommitdiffstats
path: root/meta-boot2qt/conf
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-09-10 17:01:55 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-09-10 17:01:55 +0300
commitc38d1b6eecfa0e209a0c1fa93319bf4aeb6e3759 (patch)
tree14aa05d27ee4012a8c6b62e847792f9b31d6db52 /meta-boot2qt/conf
parenta0d9fb33f8475336fbdebdbab803f43c7b9107d4 (diff)
parent014389ed5af9c5870efbbcd2c03f9641f65cda99 (diff)
downloadmeta-boot2qt-c38d1b6eecfa0e209a0c1fa93319bf4aeb6e3759.tar.gz
Merge remote-tracking branch 'origin/pyro' into sumo
* origin/pyro: (29 commits) meta-qt5: update layer qt5: Enable Link Time Optimization toradex: add Qt marketing slides toradex: add support for colibri-imx6ull rpi: include mcp2515 overlay for CAN support qtdeviceutilities: update to latest version boot2qt-demos: update revision boot2qt-addons: update components meta-qt5: update layer boot2qt-launcher: update to latest version qtdeviceutilities: update to latest version Do not use Link Time Optimization boot2qt-demo: update demo videos qtquicktimeline: fetch from public repository boot2qt-demos: no need to patch demos anymore Don't use git folder to check if we are using SDK sources toradex: include easy installer file in the release 7z toradex: Add Boot2Qt material to the Tezi image meta-qt5: update layer qt5: update submodules ... Change-Id: I23e9b0a018328d7be1441616c07c526e2db61be2
Diffstat (limited to 'meta-boot2qt/conf')
-rw-r--r--meta-boot2qt/conf/layer.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-boot2qt/conf/layer.conf b/meta-boot2qt/conf/layer.conf
index fbced17..c51ea68 100644
--- a/meta-boot2qt/conf/layer.conf
+++ b/meta-boot2qt/conf/layer.conf
@@ -39,7 +39,7 @@ BBFILE_PATTERN_b2qt := "^${LAYERDIR}/"
39BBFILE_PRIORITY_b2qt = "20" 39BBFILE_PRIORITY_b2qt = "20"
40 40
41LICENSE_PATH += "${LAYERDIR}/licenses" 41LICENSE_PATH += "${LAYERDIR}/licenses"
42QT_LICENSE = "${LAYERDIR}/licenses/The-Qt-Company-DCLA-2.1" 42QT_LICENSE = "${LAYERDIR}/licenses/The-Qt-Company-Commercial"
43B2QTBASE = "${LAYERDIR}" 43B2QTBASE = "${LAYERDIR}"
44 44
45HOSTTOOLS += "git-lfs" 45HOSTTOOLS += "git-lfs"