[qt/qt/qtgrpc]: Summary of bulk changes made
KDE Git Services - Bulk Change <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git repository change summary for qt/qt/qtgrpc Pushed by mirror-service into branch 'dev'. Changed from 42de6b89f59c638143e2740bc703c9dc4102e41b to a0fe53b7132587e950fa39905cbb036dc5d1a2b3 Acknowledgement was received that this change introduces only existing code that has been pushed to another public open source repository. This change contains the following new commits: Git commit ebcd77a3ab056fcec5b99019a5ea43c0b8500a02 by Alexandru Croitor on 30/07/2026 at 14:56.. CMake: Fix incorrect check for qtgrpcgen in src/tools/CMakeLists.txt So that the warning shows correctly for the appropriate feature. Pick-to: 6.12 Change-Id: If24c084f4e2258d9ec9673f03190505448650fc0 Reviewed-by: Orkun Tokdemir <[email protected]> https://invent.kde.org/qt/qt/qtgrpc/-/commit/ebcd77a3ab056fcec5b99019a5ea43c0b8500a02 Git commit 17f02c0e88e196fd81938f98f6015b1ca4833fd7 by Alexandru Croitor on 30/07/2026 at 14:56.. CMake: Register lookup of Tools packages in cross-builds without deps When building a cross-built Qt with QT_FORCE_BUILD_TOOLS=ON, if the necessary dependencies for protobufgen and grpcgen are not available, the tools will not be built, and as a consequence the target Qt6<Module>Dependencies.cmake file won't register a host Tools package dependency. To fix that, adjust the condition that does the extra registration to happen also when QT_FORCE_BUILD_TOOLS is ON, but the tool features are OFF, which means the dependencies were not found. This fixes example as external project builds for yocto CI platforms where the above situation happens. Specifically the find_package(Qt6 COMPONENTS Protobuf) will now do a find_package(Qt6 COMPONENTS ProtobufTools), and similarly for the Grpc module. Amends 9b0eb4c95a5004a6b043e453e599240f60280efa Pick-to: 6.12 Task-number: QTBUG-90820 Task-number: QTBUG-96232 Change-Id: Ibaa0c658655d6d69d20ecf06dd841c191d52b04b Reviewed-by: Orkun Tokdemir <[email protected]> https://invent.kde.org/qt/qt/qtgrpc/-/commit/17f02c0e88e196fd81938f98f6015b1ca4833fd7 Git commit a0fe53b7132587e950fa39905cbb036dc5d1a2b3 by Alexandru Croitor on 30/07/2026 at 14:56.. CMake: Fix building of examples as external projects Building the qtgrpc examples as external projects failed for various reason. For the examples to build successfully as external projects, we need to: 1) pass the various _ROOT / _DIR env vars to the external project CMake, so that the project can successfully find the dependencies from the custom locations. The code already attempted to do the variable passing, but it didn't work because the $ENV{Protobuf_ROOT} evaluated to FALSE in conditions, because CMake treated the path as a variable name, and no such variable name existed. The fix is to use the 'NOT $ENV{VAR} STREQUAL ""' approach to check if an environment variable has a value. This is wrapped into a new helper function, that also takes care of converting Windows paths to cmake paths. 2) pass QT_USE_VCPKG and other vcpkg related vars, so that if vcpkg is used in the main build, it's also used in the external project. But don't do it for MinGW, where we don't build the vckpg packages. Also make sure that VCPKG_MANIFEST_INSTALL is OFF, so we don't spend time downloading and building vcpkg packages in the external project. 3) Make sure to check both the lower-cased protobuf_ROOT and uppercase Protobuf_ROOT env vars, which vary depending on the host platform. 4) Account for the various openssl env vars that Qt CI sets depending on platform. 5) Don't pass grpc_ROOT for MinGW, because we don't have provisioning for it, it's an unsupported platform for the upstream grpc library. Pick-to: 6.12 Task-number: QTBUG-90820 Task-number: QTBUG-96232 Change-Id: I0cf65fb218a90783c70f2359924bd8359775ab89 Reviewed-by: Orkun Tokdemir <[email protected]> https://invent.kde.org/qt/qt/qtgrpc/-/commit/a0fe53b7132587e950fa39905cbb036dc5d1a2b3