diff options
| -rw-r--r-- | coin/instructions/coin_module_build_template_v2.yaml | 25 | ||||
| -rw-r--r-- | tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 2 |
2 files changed, 9 insertions, 18 deletions
diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml index 92532f5cb83..731f19c648c 100644 --- a/coin/instructions/coin_module_build_template_v2.yaml +++ b/coin/instructions/coin_module_build_template_v2.yaml @@ -20,7 +20,7 @@ instructions: equals_property: target.os - condition: property property: target.osVersion - not_equals_value: QEMU + not_in_values: [QEMU, WebAssembly] - type: Group instructions: - !include "{{qt/qtbase}}/cmake_cross_compilation_module_build_instructions.yaml" @@ -28,20 +28,11 @@ instructions: instructions: - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts_target.yaml" enable_if: - condition: and - conditions: - - condition: property - property: host.os - equals_property: target.os - - condition: property - property: target.osVersion - equals_value: QEMU - disable_if: - condition: and - conditions: - - condition: property - property: host.os - equals_property: target.os - - condition: property + condition: property property: target.osVersion - not_equals_value: QEMU + # We don't currently build tests for Android other than qtbase repo + in_values: [QEMU] + enable_if: + condition: property + property: target.osVersion + in_values: [IOS_ANY, Android_ANY, QEMU, QNX_710, WebAssembly] diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index 6d0ec2a4883..076106a5896 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -447,7 +447,7 @@ void tst_QRhi::nativeHandles() QVERIFY(result == QRhi::FrameOpSuccess); QVERIFY(cb); - const QRhiNativeHandles *cbHandles = cb->nativeHandles(); + Q_DECL_UNUSED const QRhiNativeHandles *cbHandles = cb->nativeHandles(); // no null check here, backends where not applicable will return null switch (impl) { |