diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-08-22 13:31:14 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-08-22 12:50:46 +0000 |
commit | 0d81ebc4f4f6d1fe0b6103860a37eacf62ffa589 (patch) | |
tree | db2850f6ae0f3e7bfe82dbdc7f6060b3354d03ef /meta-boot2qt/recipes-qt | |
parent | 75d2b5afa3b7243f439930f95b677b2678fc7e3d (diff) | |
download | meta-boot2qt-0d81ebc4f4f6d1fe0b6103860a37eacf62ffa589.tar.gz |
automotive: update revisions
Latest revision mostly from dev branches.
Change-Id: I99526e140ff88c956df869b55b216b1e729c6782
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt/recipes-qt')
5 files changed, 8 insertions, 5 deletions
diff --git a/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb index 3f2f680..a3ec584 100644 --- a/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb | |||
@@ -9,7 +9,7 @@ inherit cmake_qt5 | |||
9 | SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" | 9 | SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" |
10 | 10 | ||
11 | BRANCH = "5.11" | 11 | BRANCH = "5.11" |
12 | SRCREV = "3a35d9ec64a3c32503c1252edc2608ad49f05b40" | 12 | SRCREV = "2cd4585e287a2bcf80572505537e5e75d020c5f5" |
13 | PV = "${BRANCH}+git${SRCPV}" | 13 | PV = "${BRANCH}+git${SRCPV}" |
14 | 14 | ||
15 | DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \ | 15 | DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \ |
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb index 82aaac0..5b8c687 100644 --- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb | |||
@@ -39,12 +39,13 @@ inherit qt5-module systemd | |||
39 | require recipes-qt/qt5/qt5-git.inc | 39 | require recipes-qt/qt5/qt5-git.inc |
40 | 40 | ||
41 | QT_GIT_PROJECT = "qt-apps" | 41 | QT_GIT_PROJECT = "qt-apps" |
42 | QT_MODULE_BRANCH = "dev" | ||
42 | 43 | ||
43 | SRC_URI += " \ | 44 | SRC_URI += " \ |
44 | file://neptune.service \ | 45 | file://neptune.service \ |
45 | " | 46 | " |
46 | 47 | ||
47 | SRCREV = "4509d7d8a1e5675cebf17ffeb74ba72a90ed296f" | 48 | SRCREV = "7b244d7f3d7db956756aa721dffe65b184bade98" |
48 | 49 | ||
49 | QMAKE_PROFILES = "${S}/neptune3-ui.pro" | 50 | QMAKE_PROFILES = "${S}/neptune3-ui.pro" |
50 | 51 | ||
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb index d147891..8561c01 100644 --- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb | |||
@@ -37,7 +37,7 @@ 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 = "448d7ce1e2cfad09dbe2de87d9cc9b1615bd92ff" | 40 | SRCREV = "e400161c6ec932c180e8b9fe5e5d00a593ee254a" |
41 | 41 | ||
42 | DEPENDS = "qtbase qtdeclarative" | 42 | DEPENDS = "qtbase qtdeclarative" |
43 | 43 | ||
diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb index 4374856..d5ba176 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb | |||
@@ -34,7 +34,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=ff238b33ff354a0d8d79851a9c061717" | |||
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 | SRCREV = "37ec2100342e3447552f0948aac11c155408254f" | 37 | QT_MODULE_BRANCH = "dev" |
38 | SRCREV = "08ee6cf6bfff3bfc1cde8552231da12a51dd3b49" | ||
38 | 39 | ||
39 | DEPENDS = "qtbase qtdeclarative libyaml libarchive \ | 40 | DEPENDS = "qtbase qtdeclarative libyaml libarchive \ |
40 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}" | 41 | ${@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 6a59f4b..fa2e1c3 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb | |||
@@ -43,6 +43,7 @@ inherit qt5-module | |||
43 | inherit python3native | 43 | inherit python3native |
44 | require recipes-qt/qt5/qt5-git.inc | 44 | require recipes-qt/qt5/qt5-git.inc |
45 | 45 | ||
46 | QT_MODULE_BRANCH = "dev" | ||
46 | QT_MODULE_BRANCH_QFACE = "upstream/develop" | 47 | QT_MODULE_BRANCH_QFACE = "upstream/develop" |
47 | 48 | ||
48 | SRC_URI += " \ | 49 | SRC_URI += " \ |
@@ -50,7 +51,7 @@ SRC_URI += " \ | |||
50 | 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 \ |
51 | " | 52 | " |
52 | 53 | ||
53 | SRCREV_qtivi = "2469660f37f15303508c0864c1a57aa5e189077a" | 54 | SRCREV_qtivi = "e507a49be6387361ae4862ec6c6dc5aaac9d0c77" |
54 | SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8" | 55 | SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8" |
55 | SRCREV = "${SRCREV_qtivi}" | 56 | SRCREV = "${SRCREV_qtivi}" |
56 | SRCREV_FORMAT = "qtivi_qface" | 57 | SRCREV_FORMAT = "qtivi_qface" |