diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-12 13:04:09 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-13 09:05:12 +0000 |
commit | f48752cc10266ffedee451813ceceec3e67c167f (patch) | |
tree | 35e442075f13781e49d9eb1dcfea17bcfde63ce9 /recipes-qt/qt5/qtwebengine_git.bb | |
parent | 4e7ba65ba6ad4f88683701428aba037f2091fafc (diff) | |
download | meta-qt5-f48752cc10266ffedee451813ceceec3e67c167f.tar.gz |
qt5: upgrade to 5.9.5
* use latest revision from 5.9, because 5.9.5 tag is only on 5.9.5
branch which might get removed in future I was told
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index f299f6e0..e8f44c5d 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -131,7 +131,7 @@ RDEPENDS_${PN}-examples += " \ | |||
131 | QT_MODULE_BRANCH_CHROMIUM = "56-based" | 131 | QT_MODULE_BRANCH_CHROMIUM = "56-based" |
132 | 132 | ||
133 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 | 133 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 |
134 | # 5.9.meta-qt5.4 | 134 | # 5.9.meta-qt5.5 |
135 | SRC_URI += " \ | 135 | SRC_URI += " \ |
136 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 136 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
137 | file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ | 137 | file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ |
@@ -141,7 +141,7 @@ SRC_URI += " \ | |||
141 | " | 141 | " |
142 | 142 | ||
143 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based | 143 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based |
144 | # 56-based.meta-qt5.4 | 144 | # 56-based.meta-qt5.5 |
145 | SRC_URI += " \ | 145 | SRC_URI += " \ |
146 | file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ | 146 | file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ |
147 | file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ | 147 | file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ |
@@ -164,8 +164,8 @@ SRC_URI_append_libc-musl = "\ | |||
164 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 164 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
165 | " | 165 | " |
166 | 166 | ||
167 | SRCREV_qtwebengine = "a86ac3eb0a917766897284a6404ada00bf327629" | 167 | SRCREV_qtwebengine = "7af0066e50aa4c73cadafe2d47bc368a5b0187f6" |
168 | SRCREV_chromium = "b7a9c9bf5b6bc08ae8746b7679317a9027868681" | 168 | SRCREV_chromium = "4f2e755be232c9083108e55a30876a19b67e25d4" |
169 | SRCREV = "${SRCREV_qtwebengine}" | 169 | SRCREV = "${SRCREV_qtwebengine}" |
170 | 170 | ||
171 | SRCREV_FORMAT = "qtwebengine_chromium" | 171 | SRCREV_FORMAT = "qtwebengine_chromium" |