From 8428f116d927861691088be121ed2ad7423dc9d0 Mon Sep 17 00:00:00 2001 From: Jacek Poplawski Date: Mon, 16 Jun 2025 09:46:06 +0200 Subject: [PATCH] Coin: re-enable harfbuzz on VxWorks for Intel Disabling HarfBuzz causes tst_qglyphrun and tst_qfontdatabase to fail. Also without HarfBuzz, tst_qxmlstream is too slow and always times out. Task-number: QTBUG-137809 Change-Id: I5794c7f2f3b371f80dcfbb9d53f95572d874bf2a Reviewed-by: Toni Saario --- .../cmake_platforms_qemu_vxworks_buildtest_static.yaml | 2 +- .../cmake_platforms_qemu_vxworks_tests_static.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml index 8e700627..6d190520 100644 --- a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml @@ -42,7 +42,7 @@ Configurations: Environment variables: [ 'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB', 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples', - 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DFEATURE_harfbuzz=no -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target', + 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target', 'VCPKG_HOST_TRIPLET=x64-linux-qt', 'VCPKG_TARGET_TRIPLET=x64-vxworks-qt', ] diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml index e7d1b6dd..6e361da1 100644 --- a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml @@ -30,7 +30,7 @@ Configurations: 'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB', 'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib', 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples', - 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DFEATURE_harfbuzz=no -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target', + 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target', 'VCPKG_HOST_TRIPLET=x64-linux-qt', 'VCPKG_TARGET_TRIPLET=x64-vxworks-qt', ]