mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
qtwebengine: remove patch from examples
Fixes have been merged upstream. Change-Id: Ib0e6d42e9d2b70e8919a4cac437dad868581ce14 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
parent
366b4fb6e5
commit
27eb78d4b2
|
|
@ -14,10 +14,6 @@ QT_MODULE = "qtwebengine"
|
||||||
include recipes-qt/qt6/qt6-git.inc
|
include recipes-qt/qt6/qt6-git.inc
|
||||||
include recipes-qt/qt6/qt6-examples.inc
|
include recipes-qt/qt6/qt6-examples.inc
|
||||||
|
|
||||||
SRC_URI += "\
|
|
||||||
file://0002-Enable-examples.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
DEPENDS += "\
|
DEPENDS += "\
|
||||||
qtdeclarative-native \
|
qtdeclarative-native \
|
||||||
qtpdf \
|
qtpdf \
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,6 @@ QT_MODULE = "qtwebengine"
|
||||||
include recipes-qt/qt6/qt6-git.inc
|
include recipes-qt/qt6/qt6-git.inc
|
||||||
include recipes-qt/qt6/qt6-examples.inc
|
include recipes-qt/qt6/qt6-examples.inc
|
||||||
|
|
||||||
SRC_URI += "\
|
|
||||||
file://0002-Enable-examples.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
DEPENDS += "\
|
DEPENDS += "\
|
||||||
qtdeclarative-native \
|
qtdeclarative-native \
|
||||||
qtwebengine \
|
qtwebengine \
|
||||||
|
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
From d9c6e7d8dff9081be48bd796f78dd5827cb8a0d3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
|
||||||
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()
|
|
||||||
Loading…
Reference in New Issue
Block a user