lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-09 20:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

coin: Enable target-protoc for vcpkg-provided protobuf

Browse Source 
This feature enables us to build protobuf with different host/target
triplets to lipo the result.

Fixes: QTBUG-145933
Change-Id: I1456c148686c27cecc6f1f2f5decdeb6f0a2304d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann
2026-04-22 12:29:07 +02:00
parent c653ec850c
commit 35389bc1be
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/shared/vcpkg/vcpkg-configuration.json
View File

@@ -3,7 +3,7 @@
"default-registry": { "default-registry": {
"kind": "git", "kind": "git",
"repository": "https://git.qt.io/qtbuildsystem/vcpkg", "repository": "https://git.qt.io/qtbuildsystem/vcpkg",
"baseline": "9c5c2a0ab75aff5bcd08142525f6ff7f6f7ddeee" "baseline": "69d76a39e959a55928eb01b206fd82ef1746ffb4"
}, },
"overlay-triplets": [ "./../triplets" ] "overlay-triplets": [ "./../triplets" ]
} }

10
coin/provisioning/common/shared/vcpkg/vcpkg.json
View File

@@ -8,7 +8,15 @@
], ],
"dependencies": [ "dependencies": [
"openssl", "openssl",
"protobuf", {
"name": "protobuf",
"platform": "!osx"
},
{
"name": "protobuf",
"platform": "osx",
"features": [ "target-protoc" ]
},
"grpc" "grpc"
] ]
} }

2
coin/provisioning/common/shared/vcpkg_version.txt
View File

@@ -1 +1 @@
vcpkg_version=2025.09.17 vcpkg_version=2025.09.17-qt01