diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-11 09:27:20 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-11 09:28:01 +0200 |
| commit | 75e93a6ecb121d9aa0ee4aa986b3eef0dd20ea22 (patch) | |
| tree | 9c50c69852153a629d6507925c198ab09502ee4d /meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb | |
| parent | ff68de7e1d41b2cd81b0ffd16759d2c738554705 (diff) | |
| parent | b97117dfe83a5b73e8d27c6818902e0d1cfca7ba (diff) | |
| download | meta-boot2qt-75e93a6ecb121d9aa0ee4aa986b3eef0dd20ea22.tar.gz | |
Merge remote-tracking branch 'origin/QtAS-5.12.0' into sumo
* origin/QtAS-5.12.0:
b97117d automotive: update revisions
4281e5b automotive: update revisions
b344daf automotive: update neptune 3 revision
a143fbc Use ABI flavor with QtCreator
9ee5a7f QBSP: add correct cmake generator for windows toolchain
8fcf3a1 meta-qt5: update revision
0385367 Merge commit 'origin/sumo' into QtAS-5.12.0
9a57170 automotive: update revisions
Conflicts:
scripts/manifest.xml
Change-Id: I3064a526fd7861ea1aa0ec9b42c016c74dbc23eb
Diffstat (limited to 'meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb')
| -rw-r--r-- | meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb index c267e3f..7c81fc5 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb | |||
| @@ -29,13 +29,13 @@ | |||
| 29 | 29 | ||
| 30 | DESCRIPTION = "Qt component for application lifecycle management" | 30 | DESCRIPTION = "Qt component for application lifecycle management" |
| 31 | LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-Commercial" | 31 | LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-Commercial" |
| 32 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=ff238b33ff354a0d8d79851a9c061717" | 32 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" |
| 33 | 33 | ||
| 34 | inherit qt5-module | 34 | inherit qt5-module |
| 35 | require recipes-qt/qt5/qt5-git.inc | 35 | require recipes-qt/qt5/qt5-git.inc |
| 36 | 36 | ||
| 37 | QT_MODULE_BRANCH = "dev" | 37 | QT_MODULE_BRANCH = "dev" |
| 38 | SRCREV = "adb57812ee1cf89f3311f8a27ef97abf5d424bde" | 38 | SRCREV = "9c4ff31161c2ea09c790ab143a23b3fe997ed4a3" |
| 39 | 39 | ||
| 40 | DEPENDS = "qtbase qtdeclarative libyaml libarchive \ | 40 | DEPENDS = "qtbase qtdeclarative libyaml libarchive \ |
| 41 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}" | 41 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}" |