From 8fbde083077cd7126cfff2d8587b876b1a8c49a5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 19 May 2025 11:07:51 +0000 Subject: [PATCH] qtgrpc: remove unneeded patch Original issue has been fixed in upstream. Change-Id: I22c4daf0f62d1c162ace01976adf70b03494e786 Reviewed-by: Ari Parkkila --- ...export-of-QT_PROTO_INCLUDES-property.patch | 30 ------------------- recipes-qt/qt6/qtgrpc_git.bb | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 recipes-qt/qt6/qtgrpc/0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch diff --git a/recipes-qt/qt6/qtgrpc/0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch b/recipes-qt/qt6/qtgrpc/0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch deleted file mode 100644 index 14b890f..0000000 --- a/recipes-qt/qt6/qtgrpc/0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7e5ddd2e22c57fcd2eb7c8ae24150deb564a1b57 Mon Sep 17 00:00:00 2001 -From: Alexey Edelev -Date: Wed, 16 Oct 2024 11:19:03 +0200 -Subject: [PATCH] Remove the export of QT_PROTO_INCLUDES property - -The export is not needed in recent version since the QT_PROTO_INCLUDES -property is calculated according to the QtProtobufWellknownTypes -install/staging/build prefixes. - -Pick-to: 6.8 -Fixes: QTBUG-130113 -Change-Id: I81ddc90334b4828ce5c73fe2ef0f12e3efe6b07c -Upstream-Status: Submitted ---- - src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake b/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake -index 50900553..49152702 100644 ---- a/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake -+++ b/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake -@@ -121,8 +121,6 @@ function(qt_internal_add_protobuf_wellknown_types target) - EXPORT_NAME_PREFIX "${INSTALL_CMAKE_NAMESPACE}${target}" - ) - endif() -- -- set_property(TARGET ${target} APPEND PROPERTY EXPORT_PROPERTIES QT_PROTO_INCLUDES) - endfunction() - - # The function generates the header 'alias_file' containing the include of the original diff --git a/recipes-qt/qt6/qtgrpc_git.bb b/recipes-qt/qt6/qtgrpc_git.bb index 3c5bf8a..70394c8 100644 --- a/recipes-qt/qt6/qtgrpc_git.bb +++ b/recipes-qt/qt6/qtgrpc_git.bb @@ -13,8 +13,6 @@ inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc -SRC_URI += "file://0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch" - DEPENDS += "qtbase qtgrpc-native protobuf protobuf-native" PACKAGECONFIG ?= "qml"