From 7d3fec671f64d41f0f15f2329c0f07f5bae37676 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 27 Jun 2023 15:39:27 +0300 Subject: [PATCH] Update qtsaferenderer.yaml, add 'Target os' field Add 'Target os' field for static configurations to make sure targets are not overwritten when exporting the integration. Pick-to: 6.5.1 Change-Id: I0c1b6602423b97f5be5dd7d146a37a3f41eced00 Reviewed-by: Teemu Holappa --- coin/platform_configs/qtsaferenderer.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 94c5e87d..d787a0b3 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -28,6 +28,7 @@ Configurations: - Id: 'macos-latest-xcode-universal-static-build' Template: 'qtci-macos-12-x86_64-106' + Target os: 'MacOS_12_Static' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] @@ -38,6 +39,7 @@ Configurations: - Id: 'Linux-RHEL_8_4_Static' Template: 'qtci-linux-RHEL-8.4-x86_64-50' + Target os: 'RHEL_8_4_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' @@ -47,6 +49,7 @@ Configurations: - Id: 'Windows-MSVC2019_Static' Template: 'qtci-windows-10_22H2-x86_64-50' + Target os: 'Windows_10_Static' Compiler: 'MSVC2019' 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'