Compare commits

...

2 Commits

Author SHA1 Message Date
Teemu Holappa
8a98b34cc7 Update macOS from 12 to 14 in qtsaferenderer.yaml
Pick-to: 6.8
Change-Id: Ie03a14449e941a71acc58e5de78b980690ce221f
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2025-01-27 20:12:05 +02:00
Teemu Holappa
6800c5916f Fix QtSafeRenderer MSVC static build
Fixes compile error: Unknown command line option '-plugin-sql-sqlite'

Pick-to: 6.8
Change-Id: I5b52552492de3efb0aa80e94ecf670539e93b09e
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2025-01-27 09:41:37 +00:00

View File

@@ -2,8 +2,8 @@ Version: 2
Include: [
macos.yaml: [
"macos-universal-on-x86_64",
"macos-12-x86_64-tests",
"macos-12-arm-on-arm64-tests"
"macos-14-x86_64-tests",
"macos-14-arm64-tests"
],
cmake_platforms.yaml: [
"ubuntu-22.04",
@@ -27,8 +27,8 @@ Include: [
# Static build configurations for tools
Configurations:
-
Id: 'macOS-12-latest-xcode-universal_Static'
Template: 'qtci-macos-12-x86_64-107'
Id: 'macos-latest-x code-universal-static-build'
Template: 'qtci-macos-14-arm-106'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
@@ -73,7 +73,7 @@ Configurations:
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2022'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql -plugin-sql-sqlite -plugin-sql-odbc'
Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',