diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-08-15 07:36:08 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-08-15 06:00:06 +0000 |
commit | 2b11595512f830532c4f06c8ed5f4bc6b67ce9d2 (patch) | |
tree | 1b5fc5f71c1141ce07eedb590b7b0a6b64841cc3 | |
parent | 766c7d822a6312c6639a3af7b2d01b3799ffe40e (diff) |
automotive: update submodules
Add the updated commercial license to qmllive
Change-Id: Iaeb07e22e1334e05e3f16e14f6f118af80ba77ff
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | meta-boot2qt/recipes-qt/automotive/qmllive_git.bb | 4 | ||||
-rw-r--r-- | meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb | 2 | ||||
-rw-r--r-- | meta-boot2qt/recipes-qt/automotive/qtivi_git.bb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb index d147891b..fb3d9127 100644 --- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb @@ -29,7 +29,7 @@ DESCRIPTION = "QML Live target runtime" -LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" +LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c" inherit qmake5 @@ -37,7 +37,7 @@ require recipes-qt/qt5/qt5-git.inc QT_GIT_PROJECT = "qt-apps" -SRCREV = "448d7ce1e2cfad09dbe2de87d9cc9b1615bd92ff" +SRCREV = "a0f2af7fc25b49d082111f6c853e64188e6b4743" DEPENDS = "qtbase qtdeclarative" diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb index 75b7b0e7..82a9bcd6 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=ff238b33ff354a0d8d79851a9c061717" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "37ec2100342e3447552f0948aac11c155408254f" +SRCREV = "201656bedec57dbd22b3fc3089148e6c7453875c" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}" diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb index aa517749..c933cfbc 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb @@ -50,7 +50,7 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "2469660f37f15303508c0864c1a57aa5e189077a" +SRCREV_qtivi = "9597934087e395659aedb7735e1fc233a3407fd7" SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" |