From 461782f00234c730c35d0ef0af16a00e6a7f053d Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Mon, 25 Nov 2024 14:56:21 +0200 Subject: [PATCH] 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 --- coin/platform_configs/qtsaferenderer-runtime.yaml | 9 ++++----- coin/platform_configs/qtsaferenderer.yaml | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index 74116f8c..54f9b52d 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -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", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index f1f82d14..e1699993 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -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", @@ -46,9 +45,9 @@ 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' + 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: [