CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qtdeclarative: remove patch

Browse Source 
The fix was merged and patch is no longer needed.

Change-Id: I013e2077638fe692bf6f494b1e12115e3edaaa2a
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
This commit is contained in:
Samuli Piippo 2022-06-28 14:52:46 +03:00
parent 9f297583dc
commit cc13555263
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
recipes-qt/qt6/qtdeclarative/0001-CMake-add-dependency-to-QmlIntegration-in-qmlsplitli.patch
View File

@ -1,30 +0,0 @@
From 8513ca0e1afd109a5f9989b20409e1a417502d3a Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 22 Jun 2022 11:46:36 +0300
Subject: [PATCH] CMake: add dependency to QmlIntegration in qmlsplitlib test
Amend c3503e19e71a9fecf08a181c50d90043a4ea4edf and add dependency
to Qml to fix:
| /home/qt/work/build/build/tmp/work/core2-32-poky-linux/qtdeclarative/6.5.0-r0/git/tests/auto/qml/qmlsplitlib/lib.h:8:10: fatal error: QtQmlIntegration/qqmlintegration.h: No such file or directory
| 8 | #include <QtQmlIntegration/qqmlintegration.h>
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Change-Id: I591b6cc4d0d2aefc20f243a0a5b9f7780b5e47bd
---
tests/auto/qml/qmlsplitlib/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/auto/qml/qmlsplitlib/CMakeLists.txt b/tests/auto/qml/qmlsplitlib/CMakeLists.txt
index f65b2bc7de..4a67f76da9 100644
--- a/tests/auto/qml/qmlsplitlib/CMakeLists.txt
+++ b/tests/auto/qml/qmlsplitlib/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_autogen_tools_initial_setup(tst_qmlsplitlib_library)
target_include_directories(tst_qmlsplitlib_library PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) # find autogenerated header
generate_export_header(tst_qmlsplitlib_library)
-target_link_libraries(tst_qmlsplitlib_library Qt::Core)
+target_link_libraries(tst_qmlsplitlib_library Qt::Core Qt::QmlIntegration)
qt_internal_add_test(tst_qmlsplitlib
SOURCES

1
recipes-qt/qt6/qtdeclarative_git.bb
View File

@ -17,7 +17,6 @@ include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-tests-disable-failing-tests.patch \
file://0001-CMake-add-dependency-to-QmlIntegration-in-qmlsplitli.patch \
"
DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver"