diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-06-09 05:42:14 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-06-12 06:48:59 +0000 |
| commit | abcd9410cd373425e2b84005f2682314dac23202 (patch) | |
| tree | 08bfe8a7804e304072ad6034abf4bdbc698afd3e | |
| parent | 1c098eb6b2e424cd17120e991e8541748f6b1289 (diff) | |
qtwebengine: update patchv6.6.0-beta1
Fuzz detected.
Change-Id: I5be6c8841f414a3fe73d0805be6b2b83e667c155
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 4af8539dcf30228a36b5e70355a4cf35352880b1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch b/recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch index 5886d0a..89e8a6a 100644 --- a/recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch +++ b/recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch @@ -1,4 +1,4 @@ -From c480cd09ed0297975f533c538faf26c7d4fcbe48 Mon Sep 17 00:00:00 2001 +From e6aff8d72eda7d3ea782779a4e45cf43e42b800a Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 18 Aug 2021 15:09:41 +0300 Subject: [PATCH] CMake: use generated yocto toolchains @@ -10,16 +10,17 @@ target binaries where needed. Upstream-Status: Inappropriate [embedded specific] Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127 + --- cmake/Functions.cmake | 12 +++++------- src/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake -index b460dbbe8..98db2e52e 100644 +index b90447ed3..a63145b28 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake -@@ -819,7 +819,7 @@ endfunction() +@@ -825,7 +825,7 @@ endfunction() macro(create_pkg_config_host_wrapper buildDir) find_package(PkgConfigHost) @@ -28,8 +29,8 @@ index b460dbbe8..98db2e52e 100644 create_pkg_config_wrapper("${buildDir}/pkg-config-host_wrapper.sh" "${PKG_CONFIG_HOST_EXECUTABLE}") set(PKG_CONFIG_HOST_EXECUTABLE "${buildDir}/pkg-config-host_wrapper.sh") endif() -@@ -1055,15 +1055,13 @@ endmacro() - macro(append_toolchain_setup) +@@ -1073,15 +1073,13 @@ macro(append_toolchain_setup) + endif() if(LINUX) list(APPEND gnArgArg - custom_toolchain="${buildDir}/target_toolchain:target" @@ -49,7 +50,7 @@ index b460dbbe8..98db2e52e 100644 list(APPEND gnArgArg host_cpu="${cpu}") endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a62252783..3b7e4975f 100644 +index 59eb27e73..b9c8f2b7f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -157,7 +157,7 @@ endif() |