Remove unneeded VCPKG parameters in 6.10

These variables were mistakenly merged into 6.10
  - VCPKG_HOST_TRIPLET
  - VCPKG_TARGET_TRIPLET

In these
  - 91627c3294
  - b36caafbb0

As in 6.10 those variables should not be used,
but it's easy that they get there via cherry-picks.

Task-number: QTQAINFRA-7273
Task-number: QTQAINFRA-7463
Change-Id: Ic4444b787207302778e8c6f93e91343be97f81f2
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Aku Pietikäinen <aku.pietikainen@qt.io>
This commit is contained in:
Tero Heikkinen
2025-12-12 20:04:58 +02:00
parent 2e7fc85baf
commit 9260fd33e8
2 changed files with 0 additions and 4 deletions

View File

@@ -195,8 +195,6 @@ Configurations:
'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}',
'VCPKG_HOST_TRIPLET=x64-windows-qt',
'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
]

View File

@@ -22,8 +22,6 @@ Configurations:
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
'VCPKG_HOST_TRIPLET=arm64-windows-qt',
'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
]
-