diff options
| author | Jani Suonpera <jani.suonpera@qt.io> | 2020-11-25 15:38:29 +0200 |
|---|---|---|
| committer | Jani Suonpera <jani.suonpera@qt.io> | 2020-12-04 09:43:52 +0200 |
| commit | 19d99b10df41b7875b3c788bc7a9d1a88734e644 (patch) | |
| tree | dc987a79b9ad1810bedfa8221533b550cf1662cc /recipes-qt/qt5/qtwebkit_git.bb | |
| parent | 545be38961a2e287c64f2ae607569e88da4bfa8b (diff) | |
| parent | 7a9f639fbd632dbe23af95c7b8123a0b907c6179 (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
Task-number: QTBUG-88755
Change-Id: I7adf9d6bb5fb8a2b0893d1c4b142db73996f20b9
Diffstat (limited to 'recipes-qt/qt5/qtwebkit_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 253c209b..a10346f4 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -17,6 +17,9 @@ SRC_URI += "\ file://0003-Fix-build-bug-for-armv32-BE.patch \ file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ file://0005-Riscv-Add-support-for-riscv.patch \ + file://0006-Fix-build-with-bison37.patch \ + file://0007-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch \ + file://0008-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch \ " inherit cmake_qt5 perlnative |