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/qmllive_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/qmllive_git.bb')
| -rw-r--r-- | meta-boot2qt/recipes-qt/automotive/qmllive_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb index 52cfcff..a0b49f6 100644 --- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb | |||
| @@ -30,14 +30,14 @@ | |||
| 30 | DESCRIPTION = "QML Live target runtime" | 30 | DESCRIPTION = "QML Live target runtime" |
| 31 | 31 | ||
| 32 | LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" | 32 | LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" |
| 33 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c" | 33 | LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" |
| 34 | 34 | ||
| 35 | inherit qmake5 | 35 | inherit qmake5 |
| 36 | require recipes-qt/qt5/qt5-git.inc | 36 | require recipes-qt/qt5/qt5-git.inc |
| 37 | 37 | ||
| 38 | QT_GIT_PROJECT = "qt-apps" | 38 | QT_GIT_PROJECT = "qt-apps" |
| 39 | 39 | ||
| 40 | SRCREV = "329a996f6a52494ef677107593a0146c71a2880a" | 40 | SRCREV = "dc83ea3bcbcfece8a0c5caeafcdd9f0854ffae6f" |
| 41 | 41 | ||
| 42 | DEPENDS = "qtbase qtdeclarative" | 42 | DEPENDS = "qtbase qtdeclarative" |
| 43 | 43 | ||