mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
qtlottie: remove patch
Merged into upstream. Change-Id: Id1004bdf4351fea20988293d94b044742dabd6c9 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
parent
3c3508a12b
commit
430bd68a04
|
|
@ -1,27 +0,0 @@
|
|||
From c89beb45b21d1b7baa37494a0c8ff30305c7996f Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Fri, 27 Jun 2025 06:49:13 +0300
|
||||
Subject: [PATCH] CMake: find QuickControls2
|
||||
|
||||
Needed for qtlottieviewer example.
|
||||
|
||||
Pick-to: 6.10
|
||||
Change-Id: I94dee8823ad53cdc2e323cfdd2a554d03f9c6d7a
|
||||
Upstream-Status: Submitted
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a2e4561..e21d818 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@ qt_internal_project_setup()
|
||||
|
||||
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Core)
|
||||
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Qml Quick QuickTest
|
||||
-QuickVectorImageGeneratorPrivate)
|
||||
+QuickVectorImageGeneratorPrivate QuickControls2)
|
||||
|
||||
if(NOT TARGET Qt6::Gui)
|
||||
message(NOTICE "Skipping the build as Qt6::Gui cannot be found.")
|
||||
|
|
@ -10,8 +10,6 @@ inherit qt6-cmake
|
|||
include recipes-qt/qt6/qt6-git.inc
|
||||
include recipes-qt/qt6/qt6.inc
|
||||
|
||||
SRC_URI += "file://0001-CMake-find-QuickControls2.patch"
|
||||
|
||||
DEPENDS += "\
|
||||
qtbase \
|
||||
qtdeclarative \
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user