Compare commits

..

3 Commits

Author SHA1 Message Date
Antti Kokko
16ff073337 Update qtsaferenderer.yaml, add missing 'Target os' field
Add 'Target os' field for static configurations
to make sure targets are not overwritten when
exporting the integration.

Change-Id: Ib99f38f21c4324bf5ac8f8ef6d41e508aef9e7d7
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2024-11-29 11:24:41 +00:00
Antti Kokko
a2ecc870d6 Fix qtsaferenderer MSVC 2022 static build
Amends 4bb8d4486b

Change-Id: I0c73b6b474edb695c39b157029faf943f0626dbc
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2024-11-27 12:27:38 +00:00
Antti Kokko
461782f002 Update qsr and qsr-runtime target configuration
Updated targets were not available in the
6.8.1 branch.

Change-Id: I08b3b4172c281a4b0c5605ec626f36342ddf6571
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2024-11-26 14:57:12 +02:00
2 changed files with 12 additions and 11 deletions

View File

@@ -10,14 +10,13 @@ Include: [
"ubuntu-22.04-documentation",
"opensuse-15.5-developer-build",
"sles-15_sp5-static",
"windows-10_22h2-msvc2019",
"windows-10_22h2-msvc2022",
"windows-10_22h2-msvc2019-developer-build",
"windows-11_23H2-msvc2022-developer-build",
"rhel-8.10",
"windows-10_22h2-mingw13",
"windows-10_22h2-mingw13-developer-build",
"windows-10_22h2-llvm",
"windows-11_23H2-msvc2019"
"windows-11_23H2-mingw13-developer-build",
"windows-11_23H2-llvm",
"windows-11_23H2-msvc2022"
],
cmake_platforms_qemu_qnx710.yaml: [
"qnx-710-x86_64-developer-build-on-linux",

View File

@@ -10,12 +10,11 @@ Include: [
"ubuntu-22.04-documentation",
"opensuse-15.5-developer-build",
"sles-15_sp5-static",
"windows-10_22h2-msvc2019",
"windows-10_22h2-msvc2022",
"rhel-8.10",
"windows-10_22h2-mingw13",
"windows-10_22h2-llvm",
"windows-11_23H2-msvc2019"
"windows-11_23H2-llvm",
"windows-11_23H2-msvc2022"
],
cmake_platforms_qemu_qnx710.yaml: [
"qnx-710-x86_64-developer-build-on-linux",
@@ -28,6 +27,7 @@ Configurations:
-
Id: 'macos-latest-xcode-universal-static-build'
Template: 'qtci-macos-12-x86_64-107'
Target os: 'MacOS_12_Static'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
@@ -38,6 +38,7 @@ Configurations:
-
Id: 'Linux-RHEL_8_10_Static'
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
Target os: 'RHEL_8_10_Static'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
@@ -46,11 +47,12 @@ Configurations:
'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON'
]
-
Id: 'Windows-MSVC2019_Static'
Id: 'Windows-MSVC2022_Static'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2019'
Target os: 'Windows_10_Static'
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}}',