summaryrefslogtreecommitdiffstats
path: root/meta-boot2qt-distro
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-05-09 12:43:04 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-05-09 12:43:04 +0300
commit50e2273cb2525f5f129b3029f2896d024c8456c6 (patch)
tree40621ed59fbd04545fd768e4d683a63c25d2d42a /meta-boot2qt-distro
parenta159f256fe1475b9d91c0b01b0381392c396cc25 (diff)
parentf3d5b8731a54e1bad92ce5903b5a7dc7f4be6026 (diff)
downloadmeta-boot2qt-50e2273cb2525f5f129b3029f2896d024c8456c6.tar.gz
Merge remote-tracking branch 'origin/morty' into pyro
* origin/morty: poky, meta-mingw: update to latest revision in morty branch qtdeviceutilities: update to latest version Add product name and Qt version to image conf Revert "Add appman versions of Kit and Qt to creator" Change-Id: I3c0e48b7c9202a7b0081f3c56966af3283cf2650
Diffstat (limited to 'meta-boot2qt-distro')
-rw-r--r--meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb
index 67819d7..5150463 100644
--- a/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb
@@ -32,7 +32,7 @@ LICENSE = "The-Qt-Company-DCLA-2.1"
32LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" 32LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
33PR = "r0" 33PR = "r0"
34 34
35DEPLOY_CONF_TYPE = "Automotive" 35DEPLOY_CONF_TYPE = "Qt Automotive Suite 5.11.0"
36 36
37IMAGE_FEATURES += "\ 37IMAGE_FEATURES += "\
38 package-management \ 38 package-management \