summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bbappend
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-08-17 12:58:24 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-08-17 12:58:44 +0300
commit0f25d3ba14c8e5e946c834f1508b5c4d3931c0cc (patch)
tree5204c200c70f02858cdf88b1a59f519212497e71 /recipes-qt/qt5/qtwebengine_git.bbappend
parent6b5219b8034c9ffd3094657486e500119ad47325 (diff)
parent10c9d074e0b3a00ef45d0764c7283fe2cdade101 (diff)
downloadmeta-boot2qt-0f25d3ba14c8e5e946c834f1508b5c4d3931c0cc.tar.gz
Merge remote-tracking branch 'origin/jethro' into dev
* origin/jethro: (26 commits) Fix colibri- vf & imx7 partitions Add u-boot script for iMX7 Fix colibri-vf and imx6 build Fix colibri-vf build Add support for Toradex Colibri-iMX7 Updated Boundary devices kernel version to 3.14.52 Updated neptune-ui, qtivi, and appman sha Update GammaRay and enable workaround for Boot2Qt compatibility Added QMLLive to automotive images Update gammaray version to fc0b87dcff40276bc1e4ad6c86674363ca576617 --> 2.5 Change git fetch protocol from ssh to http for automotive packages Change b2qt-addons fetch protocol from git to http b2qt-ota: update repository URL b2qt-demos: update qtwebbrowser url systemd: handle bind mounts set from initramfs Enable QT_QPA_EGLFS_FORCEVSYNC=1 on nitrogen6x device. Colibri fails to build after this change, so we revert it. Update Qt submodule revisions Updated Boundary devices kernel version to 3.14.52 Update meta-mingw version ... Change-Id: I951db6a4f523eb9a6ad72dc3013702a5ef44d56c
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bbappend')
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bbappend2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index 326c286..c5ae88f 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -33,5 +33,5 @@ SRC_URI_append_mx6 = " \
33 file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ 33 file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
34 " 34 "
35 35
36SRCREV_qtwebengine = "96df24618fbbc0e06a24e93b7e9aefb0f923f4af" 36SRCREV_qtwebengine = "a833bc8e4e2a2545c8920c329b084a9373c261c5"
37SRCREV_chromium = "168cc2b83c53e4e68bf89b331d92da88a99d2bf3" 37SRCREV_chromium = "168cc2b83c53e4e68bf89b331d92da88a99d2bf3"