diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-10 17:01:55 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-10 17:01:55 +0300 |
commit | c38d1b6eecfa0e209a0c1fa93319bf4aeb6e3759 (patch) | |
tree | 14aa05d27ee4012a8c6b62e847792f9b31d6db52 /meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb | |
parent | a0d9fb33f8475336fbdebdbab803f43c7b9107d4 (diff) | |
parent | 014389ed5af9c5870efbbcd2c03f9641f65cda99 (diff) | |
download | meta-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/recipes-qt/automotive/neptune3-ui_git.bb')
-rw-r--r-- | meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb index 5b8c687..54539e2 100644 --- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb | |||
@@ -29,7 +29,7 @@ | |||
29 | ############################################################################ | 29 | ############################################################################ |
30 | 30 | ||
31 | DESCRIPTION = "Neptune 3 IVI UI" | 31 | DESCRIPTION = "Neptune 3 IVI UI" |
32 | LICENSE = "Apache-2.0 & ( GPL-3.0 | The-Qt-Company-DCLA-2.1 )" | 32 | LICENSE = "Apache-2.0 & ( GPL-3.0 | The-Qt-Company-Commercial )" |
33 | LIC_FILES_CHKSUM = "\ | 33 | LIC_FILES_CHKSUM = "\ |
34 | file://LICENSE.GPL3;md5=0d02f21f8e2533ecc519e2ed96bc94a2 \ | 34 | file://LICENSE.GPL3;md5=0d02f21f8e2533ecc519e2ed96bc94a2 \ |
35 | file://imports/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 35 | file://imports/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |