diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-01-25 15:36:46 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-02-12 06:58:59 +0000 |
commit | 50c4963980164ae0e9992d652fd934d85fd2400e (patch) | |
tree | 2e1a1beb461e4ea3b793e87ee0d1583273eb20fa /recipes-qt/qt5/qtwebengine_git.bb | |
parent | c907a6caee05b559ee231300a228f88708f9b7c2 (diff) | |
download | meta-qt5-50c4963980164ae0e9992d652fd934d85fd2400e.tar.gz |
qt5: Upgrade to Qt 5.11.0
QtQuickCompiler functionality is now integrated to qtdeclarative and can be
enabled with CONFIG+=qtquickcompiler. Add PACKAGECONFIG to qt5.inc, so that
any qtmodule can take advantage of this. Enable by default for qtcharts and
qtvirtualkeyboard.
Change-Id: I484b4b6c7869b3ca5630ef9685453aecc626137a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 54a22f19..6e4de7bc 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -121,7 +121,7 @@ RDEPENDS_${PN}-examples += " \ | |||
121 | qtdeclarative-qmlplugins \ | 121 | qtdeclarative-qmlplugins \ |
122 | " | 122 | " |
123 | 123 | ||
124 | QT_MODULE_BRANCH_CHROMIUM = "61-based" | 124 | QT_MODULE_BRANCH_CHROMIUM = "63-based" |
125 | 125 | ||
126 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.10 | 126 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.10 |
127 | # 5.10.meta-qt5.1 | 127 | # 5.10.meta-qt5.1 |
@@ -130,6 +130,7 @@ SRC_URI += " \ | |||
130 | file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ | 130 | file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ |
131 | file://0002-Include-dependency-to-QCoreApplication-translate.patch \ | 131 | file://0002-Include-dependency-to-QCoreApplication-translate.patch \ |
132 | file://0003-Force-host-toolchain-configuration.patch \ | 132 | file://0003-Force-host-toolchain-configuration.patch \ |
133 | file://0001-Ignore-PKG_CONFIG-shell-exports-for-Yocto.patch \ | ||
133 | " | 134 | " |
134 | SRC_URI_append_libc-musl = "\ | 135 | SRC_URI_append_libc-musl = "\ |
135 | file://0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ | 136 | file://0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ |
@@ -159,8 +160,8 @@ SRC_URI_append_libc-musl = "\ | |||
159 | file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 160 | file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
160 | " | 161 | " |
161 | 162 | ||
162 | SRCREV_qtwebengine = "14b58276822c12e8d21580f61869b5a9bbf43f22" | 163 | SRCREV_qtwebengine = "7a3e38d779352ca09e9118d735c9a2b0ea55b763" |
163 | SRCREV_chromium = "f0775ea93ab66f0676993db1633c9098dfb3a3ad" | 164 | SRCREV_chromium = "3fa04d22883e42bd987e4f83d394a1040b410024" |
164 | SRCREV = "${SRCREV_qtwebengine}" | 165 | SRCREV = "${SRCREV_qtwebengine}" |
165 | 166 | ||
166 | SRCREV_FORMAT = "qtwebengine_chromium" | 167 | SRCREV_FORMAT = "qtwebengine_chromium" |