diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-05-09 11:32:39 +0000 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-06-13 13:31:30 +0300 |
| commit | c51ee614ceec17cabd8565eaff420e2d7cd5d3dc (patch) | |
| tree | 63b2085dc42daa1343d173a3b6ad99e2b250d7b2 | |
| parent | eabb0842483630c57b1366f2c683df0bf2d09e33 (diff) | |
qtwebengine: update patch
Change-Id: I9647cba85fd4a9fcd0aadba1273b077b7ae6c844
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 682313136dc183d77425f52931486f92cc9cf35c)
| -rw-r--r-- | recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch | 10 |
1 files changed, 5 insertions, 5 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 225a8fe..2271f1b 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 271b265784767476101f64f51e87abdeeae18108 Mon Sep 17 00:00:00 2001 +From 6819917c14b55c4352dbd200bb6ab297bfd243fa 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 @@ -16,7 +16,7 @@ Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake -index 08967d6db..cebeae8eb 100644 +index 89f4cdd39..8845c94f7 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -750,7 +750,7 @@ endfunction() @@ -28,7 +28,7 @@ index 08967d6db..cebeae8eb 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() -@@ -972,9 +972,9 @@ endmacro() +@@ -979,9 +979,9 @@ endmacro() macro(append_toolchain_setup) if(LINUX) list(APPEND gnArgArg @@ -42,14 +42,14 @@ index 08967d6db..cebeae8eb 100644 get_gn_arch(cpu ${TEST_architecture_arch}) if(CMAKE_CROSSCOMPILING) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 31123d06c..c6141988b 100644 +index 921871bee..c6141988b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -151,7 +151,7 @@ endif() # HOST PROJECT ## --if(CMAKE_CROSSCOMPILING AND NOT IOS) +-if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS) +if(FALSE) if(NOT Gn_FOUND) |