From 7a6517e3306466b4f68ff4b43c277df08996ba73 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Fri, 24 Nov 2023 17:06:53 +0200 Subject: [PATCH 1/2] Bump version to 5.15.17 Change-Id: I565fd92322d7dcbb210728113d5e57bafa99b942 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 859c64cc6..95eb05e7b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -6,4 +6,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH DEFINES += QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 5.15.16 +MODULE_VERSION = 5.15.17 From dac2afc9c6cffd42e49030dcafffc1e0a05873b9 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Mon, 19 Feb 2024 11:44:41 +0200 Subject: [PATCH 2/2] Windows 7: blacklist tests that fail from low screen resolution When OpenNebula was updated in CI, new Windows provisions defaulted to 800x600 resolution which caused some tests to fail. Adding new display settings to the Windows registry in tier-2 provisioning scripts worked on Windows 10/11 but issues with Windows 7 persists, one of my suspicions is that Windows 7 VM spawns a new empty video subkey in the registry when it's launched by a module in Coin run, which happens after provisioning scripts are run and done. This issue is blocking Qt 5.15 integrations, so for now it is best to blacklist the tests that fail from the 800x600 screen resolution. Task-number: QTQAINFRA-6145 Change-Id: Ib108c6de8ec6d5cd0b2601c50ce44cca2e432089 Reviewed-by: Qt CI Bot Reviewed-by: Tarja Sundqvist --- tests/auto/render/pickboundingvolumejob/BLACKLIST | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 tests/auto/render/pickboundingvolumejob/BLACKLIST diff --git a/tests/auto/render/pickboundingvolumejob/BLACKLIST b/tests/auto/render/pickboundingvolumejob/BLACKLIST new file mode 100644 index 000000000..2fc4fb0b5 --- /dev/null +++ b/tests/auto/render/pickboundingvolumejob/BLACKLIST @@ -0,0 +1,7 @@ +# QTQAINFRA-6145 +[checkNoPickingFGPicking] +windows-7sp1 + +# QTQAINFRA-6145 +[viewportCameraAreaGather] +windows-7sp1