summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bb
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-11-21 12:11:19 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-03-13 08:27:29 +0100
commit3efe4ea8b033f433b512ccf2cb90006a65c75834 (patch)
treec5a91e5c76c016637a5a93224afddf9eb4166164 /recipes-qt/qt5/qtwebengine_git.bb
parente6fb3850d43f857e87f7c53fc7df5933fef98cbd (diff)
downloadmeta-qt5-3efe4ea8b033f433b512ccf2cb90006a65c75834.tar.gz
qt5: upgrade to Qt 5.9.9
Additionally, update recipes with relevant diff from Qt Company maintained meta-qt5 (5.9) layer. It has few commits & some upstream content merge based changes never upstreamed for one reason or another (license alterations & other minor things). Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 37fab0bf..de06e1e7 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -25,7 +25,6 @@ DEPENDS += " \
25 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ 25 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
26" 26"
27 27
28DEPENDS += "yasm-native"
29DEPENDS_append_libc-musl = " libexecinfo" 28DEPENDS_append_libc-musl = " libexecinfo"
30 29
31EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm \ 30EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm \
@@ -164,8 +163,8 @@ SRC_URI_append_libc-musl = "\
164 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 163 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
165" 164"
166 165
167SRCREV_qtwebengine = "86f8a0dfa47fea0ba41c386a9753db94d8de3b54" 166SRCREV_qtwebengine = "745ad675fdd434cd34346909ebe9172881750c60"
168SRCREV_chromium = "45ed09101724148401a193e20e3545c8f3de4df2" 167SRCREV_chromium = "0ee076e7a6507637efad493edc367fd63b7e7fb1"
169SRCREV = "${SRCREV_qtwebengine}" 168SRCREV = "${SRCREV_qtwebengine}"
170 169
171SRCREV_FORMAT = "qtwebengine_chromium" 170SRCREV_FORMAT = "qtwebengine_chromium"