lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Ubuntu and Windows 11 arm64 targets for QSR 2.2

Browse Source 
Targets Ubuntu 24.04 arm64 & Windows 11 22H2 arm64
MSVC 2022 added.

Static and dynamic build targets for tooling repository.

Dynamic build targets for runtime repository.

Task-number: QSR-2686
Pick-to: 6.8
Change-Id: I8946a4b107ebc7c652f7f1a3a50193fa62d8ed56
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
This commit is contained in:
Antti Kokko
2024-12-20 12:02:02 +02:00
parent ad6a3499ef
commit fd3268e815
2 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coin/platform_configs/qtsaferenderer-runtime.yaml
View File

@@ -8,16 +8,16 @@ Include: [
cmake_platforms.yaml: [
"ubuntu-22.04",
"ubuntu-22.04-documentation",
"ubuntu-24.04-arm64",
"opensuse-15.5-developer-build",
"sles-15_sp5-static",
"windows-10_22h2-msvc2019",
"windows-10_22h2-msvc2022",
"windows-10_22h2-msvc2019-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",
"windows-11_22h2-arm64-msvc2022"
],
cmake_platforms_qemu_qnx710.yaml: [
"qnx-710-x86_64-developer-build-on-linux",

35
coin/platform_configs/qtsaferenderer.yaml
View File

@@ -8,14 +8,15 @@ Include: [
cmake_platforms.yaml: [
"ubuntu-22.04",
"ubuntu-22.04-documentation",
"ubuntu-24.04-arm64",
"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",
"windows-11_22h2-arm64-msvc2022"
],
cmake_platforms_qemu_qnx710.yaml: [
"qnx-710-x86_64-developer-build-on-linux",
@@ -26,7 +27,7 @@ Include: [
# Static build configurations for tools
Configurations:
-
Id: 'macos-latest-xcode-universal-static-build'
Id: 'macOS-12-latest-xcode-universal_Static'
Template: 'qtci-macos-12-x86_64-107'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
@@ -46,9 +47,31 @@ Configurations:
'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON'
]
-
Id: 'Windows-MSVC2019_Static'
Id: 'Ubuntu-24.04-arm64_Static'
Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
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'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
]
-
Id: 'Windows-MSVC2022-arm64_Static'
Template: 'qtci-windows-11_22H2-aarch64-54'
Compiler: 'MSVC2022'
Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
]
-
Id: 'Windows-MSVC2022_Static'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2019'
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'
Environment variables: [