diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-04-21 18:14:40 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-04-21 18:31:19 +0200 |
| commit | d6b6838e55aae46699e4dbdc24c13bc405e94f32 (patch) | |
| tree | 86386fa988844b3acab3f3f01ef2878b8b399728 /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | 05b3e648ec3508f4f73eeb094bdb82440519c56c (diff) | |
| download | meta-qt5-d6b6838e55aae46699e4dbdc24c13bc405e94f32.tar.gz | |
qt5: upgrade to 5.15 beta4
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 3b8bd469..cc56f5d1 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -142,10 +142,10 @@ RDEPENDS_${PN}-examples += " \ | |||
| 142 | qtdeclarative-qmlplugins \ | 142 | qtdeclarative-qmlplugins \ |
| 143 | " | 143 | " |
| 144 | 144 | ||
| 145 | QT_MODULE_BRANCH_CHROMIUM = "79-based" | 145 | QT_MODULE_BRANCH_CHROMIUM = "80-based" |
| 146 | 146 | ||
| 147 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 | 147 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 |
| 148 | # 5.15.meta-qt5.4 | 148 | # 5.15.meta-qt5.5 |
| 149 | SRC_URI += " \ | 149 | SRC_URI += " \ |
| 150 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 150 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
| 151 | file://0001-Force-host-toolchain-configuration.patch \ | 151 | file://0001-Force-host-toolchain-configuration.patch \ |
| @@ -156,8 +156,8 @@ SRC_URI_append_libc-musl = "\ | |||
| 156 | file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \ | 156 | file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \ |
| 157 | " | 157 | " |
| 158 | 158 | ||
| 159 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/79-based | 159 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based |
| 160 | # 79-based.meta-qt5.2 | 160 | # 80-based.meta-qt5.2 |
| 161 | SRC_URI += " \ | 161 | SRC_URI += " \ |
| 162 | file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ | 162 | file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ |
| 163 | file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ | 163 | file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ |
| @@ -189,8 +189,8 @@ SRC_URI_append_libc-musl = "\ | |||
| 189 | file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 189 | file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
| 190 | " | 190 | " |
| 191 | 191 | ||
| 192 | SRCREV_qtwebengine = "6b62dfe7242ce0d3067aa98620664a4dc7a656d8" | 192 | SRCREV_qtwebengine = "9e56f570e31a0ef18e544bb21dfddebfe43ec2d0" |
| 193 | SRCREV_chromium = "9424dc7ceeccf6e6d5edc7757edb39a7ae4983ab" | 193 | SRCREV_chromium = "6564891efb850d344d852c1d941ed4e9c2a732c1" |
| 194 | SRCREV = "${SRCREV_qtwebengine}" | 194 | SRCREV = "${SRCREV_qtwebengine}" |
| 195 | 195 | ||
| 196 | SRCREV_FORMAT = "qtwebengine_chromium" | 196 | SRCREV_FORMAT = "qtwebengine_chromium" |
