From 27eb78d4b2241b5e7bedeb6ec220221d69d7f232 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 28 Aug 2025 08:36:42 +0000 Subject: [PATCH] qtwebengine: remove patch from examples Fixes have been merged upstream. Change-Id: Ib0e6d42e9d2b70e8919a4cac437dad868581ce14 Reviewed-by: Mikko Gronoff --- recipes-qt/qt6/qtpdf-examples_git.bb | 4 --- recipes-qt/qt6/qtwebengine-examples_git.bb | 4 --- .../qtwebengine/0002-Enable-examples.patch | 29 ------------------- 3 files changed, 37 deletions(-) delete mode 100644 recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch diff --git a/recipes-qt/qt6/qtpdf-examples_git.bb b/recipes-qt/qt6/qtpdf-examples_git.bb index 9a2fe44..89488a5 100644 --- a/recipes-qt/qt6/qtpdf-examples_git.bb +++ b/recipes-qt/qt6/qtpdf-examples_git.bb @@ -14,10 +14,6 @@ QT_MODULE = "qtwebengine" include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6-examples.inc -SRC_URI += "\ - file://0002-Enable-examples.patch \ -" - DEPENDS += "\ qtdeclarative-native \ qtpdf \ diff --git a/recipes-qt/qt6/qtwebengine-examples_git.bb b/recipes-qt/qt6/qtwebengine-examples_git.bb index e6f161a..2c0619e 100644 --- a/recipes-qt/qt6/qtwebengine-examples_git.bb +++ b/recipes-qt/qt6/qtwebengine-examples_git.bb @@ -18,10 +18,6 @@ QT_MODULE = "qtwebengine" include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6-examples.inc -SRC_URI += "\ - file://0002-Enable-examples.patch \ -" - DEPENDS += "\ qtdeclarative-native \ qtwebengine \ diff --git a/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch b/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch deleted file mode 100644 index d8369ae..0000000 --- a/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d9c6e7d8dff9081be48bd796f78dd5827cb8a0d3 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Tue, 31 Aug 2021 18:27:48 +0300 -Subject: [PATCH] Enable examples - -The bug mentioned does not affect bitbake builds. - -Change-Id: I076763d9241061f9cdb4d46bcd88e46bd4f783aa -Upstream-Status: Inappropriate [OE Specific] ---- - examples/CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index e863dafaf..c9ed56c4e 100644 ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -3,8 +3,10 @@ - - cmake_minimum_required(VERSION 3.16) - -+find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS Pdf PdfWidgets) -+ - qt_examples_build_begin(EXTERNAL_BUILD) --if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533 -+if(TRUE) #QTBUG-86533 - if(TARGET Qt::WebEngineCore) - add_subdirectory(webenginequick) - endif()