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/neptune3-ui_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/neptune3-ui_git.bb')
| -rw-r--r-- | meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb index da0f658..ee26f08 100644 --- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | DESCRIPTION = "Neptune 3 IVI UI" | 31 | DESCRIPTION = "Neptune 3 IVI UI" |
| 32 | LICENSE = "Apache-2.0 & ( GPL-3.0 | The-Qt-Company-Commercial )" | 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=d32239bcb673463ab874e80d47fae504 \ |
| 35 | file://imports_shared/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 35 | file://imports_shared/assets/fonts/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
| 36 | " | 36 | " |
| 37 | 37 | ||
| @@ -45,7 +45,7 @@ SRC_URI += " \ | |||
| 45 | file://neptune.service \ | 45 | file://neptune.service \ |
| 46 | " | 46 | " |
| 47 | 47 | ||
| 48 | SRCREV = "c80d9aba17b1b50618ae6311d48f35ec726a4007" | 48 | SRCREV = "be372dec5a64cdfc2b2ba66ea240d9fa1cdbe3eb" |
| 49 | 49 | ||
| 50 | QMAKE_PROFILES = "${S}/neptune3-ui.pro" | 50 | QMAKE_PROFILES = "${S}/neptune3-ui.pro" |
| 51 | 51 | ||