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/qtivi_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/qtivi_git.bb')
| -rw-r--r-- | meta-boot2qt/recipes-qt/automotive/qtivi_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb index 4b122c2..cb3f6a3 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb | |||
| @@ -51,7 +51,7 @@ SRC_URI += " \ | |||
| 51 | file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ | 51 | file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ |
| 52 | " | 52 | " |
| 53 | 53 | ||
| 54 | SRCREV_qtivi = "15a6672b304fe91a928911e810f5e83f233c790e" | 54 | SRCREV_qtivi = "b18956edd578f49f369f7b3863881d0fadb035df" |
| 55 | SRCREV_qface = "0a3ae7686e1100be452b8c435bdcd84ec242340e" | 55 | SRCREV_qface = "0a3ae7686e1100be452b8c435bdcd84ec242340e" |
| 56 | SRCREV = "${SRCREV_qtivi}" | 56 | SRCREV = "${SRCREV_qtivi}" |
| 57 | SRCREV_FORMAT = "qtivi_qface" | 57 | SRCREV_FORMAT = "qtivi_qface" |