diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-13 15:41:19 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-25 05:57:35 +0000 |
commit | 49da63424ecb059d00a64ed45d89a98dabcf0af3 (patch) | |
tree | 4fb815517e786df687b3393f514bdb3e0b41e883 /meta-boot2qt/recipes-qt | |
parent | 4c88bae4e51c1ac8b4e14a999cbc1dbab7111f80 (diff) | |
download | meta-boot2qt-49da63424ecb059d00a64ed45d89a98dabcf0af3.tar.gz |
boot2qt addons: update demos, launcher & deviceutilities revisions
Update boot2qt addon modules to latest versions:
- Minor fixes & tweaks to all modules
- Qt3D demo added to launcher
Change-Id: Id5234dc5c0e202bdfcfeda934c359c930ab32226
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Diffstat (limited to 'meta-boot2qt/recipes-qt')
3 files changed, 6 insertions, 5 deletions
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb index 3900abb..16725f2 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb | |||
@@ -42,11 +42,11 @@ SRC_URI = " \ | |||
42 | https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \ | 42 | https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \ |
43 | " | 43 | " |
44 | 44 | ||
45 | PV = "5.11.2+git${SRCPV}" | 45 | PV = "5.12.0+git${SRCPV}" |
46 | 46 | ||
47 | BRANCH = "5.11" | 47 | BRANCH = "5.12" |
48 | 48 | ||
49 | SRCREV = "ca03367f33d6430d3ddbbd70edf832bced59ff74" | 49 | SRCREV = "b12865b21e3f950e417fcab6c03fbcb6cefbbd10" |
50 | 50 | ||
51 | SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da" | 51 | SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da" |
52 | SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a" | 52 | SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a" |
@@ -70,6 +70,7 @@ do_install_append() { | |||
70 | rm -rf ${D}/data/user/qtwebbrowser | 70 | rm -rf ${D}/data/user/qtwebbrowser |
71 | 71 | ||
72 | # we need all qml and content files from the demos we want to use | 72 | # we need all qml and content files from the demos we want to use |
73 | cp -r ${S}/advancedcustommaterial ${D}/data/user/qt/ | ||
73 | cp -r ${S}/datacollector ${D}/data/user/qt/ | 74 | cp -r ${S}/datacollector ${D}/data/user/qt/ |
74 | cp -r ${S}/ebike-ui ${D}/data/user/qt/ | 75 | cp -r ${S}/ebike-ui ${D}/data/user/qt/ |
75 | cp -r ${S}/enterprise-charts ${D}/data/user/qt/ | 76 | cp -r ${S}/enterprise-charts ${D}/data/user/qt/ |
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb index cda1ac7..6c50094 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb | |||
@@ -43,7 +43,7 @@ SRC_URI += " \ | |||
43 | file://ebikedata.service \ | 43 | file://ebikedata.service \ |
44 | " | 44 | " |
45 | 45 | ||
46 | SRCREV = "ce4d3833f5193168fb61392d08f61e73997632eb" | 46 | SRCREV = "cd36ba030e95688c453873df5b391a5f847d562a" |
47 | 47 | ||
48 | DEPENDS = "\ | 48 | DEPENDS = "\ |
49 | qtbase qtdeclarative qtquickcontrols2 \ | 49 | qtbase qtdeclarative qtquickcontrols2 \ |
diff --git a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb index 6313c5c..e3f3fb2 100644 --- a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb +++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb | |||
@@ -39,7 +39,7 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" | |||
39 | 39 | ||
40 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 40 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
41 | 41 | ||
42 | SRCREV = "0ecd391912f6338d5aef6105600fc8c321c83bd8" | 42 | SRCREV = "59405866644db41b866bdb561fe8ad2a1892f73b" |
43 | 43 | ||
44 | DEPENDS = "\ | 44 | DEPENDS = "\ |
45 | qtbase qtdeclarative qtconnectivity qtdeclarative-native \ | 45 | qtbase qtdeclarative qtconnectivity qtdeclarative-native \ |