mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-20 05:19:40 +08:00
Fix QNX nightly build config for Windows host
Previous dependency platform had been removed from CI, leading nightly
builds failing silently. Changed also from MSCV to mingw since it seems
to be more commonly used among customers.
Task-number: QTQAINFRA-7017
Task-number: QTQAINFRA-7000
Pick-to: 6.8
Change-Id: I009dd5e5c5ad28434816f831de37849a53f2c24f
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit c47f750e65)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
42e0846a18
commit
8605087d3a
@@ -1,7 +1,7 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml: [
|
||||
windows-10_22h2-msvc2019-developer-build
|
||||
windows-10_22h2-mingw13
|
||||
]
|
||||
]
|
||||
Configurations:
|
||||
@@ -10,12 +10,13 @@ Configurations:
|
||||
Template: 'qtci-windows-10_22H2-x86_64-53'
|
||||
Target os: 'QNX_710'
|
||||
Target arch: 'arm64'
|
||||
Compiler: 'MSVC2019'
|
||||
Compiler: 'Mingw'
|
||||
Target compiler: 'QCC'
|
||||
Platform dependency: 'windows-10_22h2-msvc2019-developer-build'
|
||||
Platform dependency: 'windows-10_22h2-mingw13'
|
||||
Features: ['DisableTests', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
|
||||
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON'
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include'
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user