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

qtgrpc: fix reference to TMPDIR QA issues

Browse Source 
Temporarily add patch to fix a QA issue related to buildpaths.

Task-number: QTBUG-105913
Pick-to: 6.8
Change-Id: Ic86bd65e81d9189abf0d18bac98991028a69f06c
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
This commit is contained in:
Samuli Piippo 2024-10-16 09:38:32 +00:00
parent 259ef13336
commit 78b79d3b55
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
recipes-qt/qt6/qtgrpc/0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch Normal file
View File

@ -0,0 +1,30 @@
From 7e5ddd2e22c57fcd2eb7c8ae24150deb564a1b57 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
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

2
recipes-qt/qt6/qtgrpc_git.bb
View File

@ -13,6 +13,8 @@ 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[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"