From 2b137b3f41765aa60e9ee3c8ba79f06e3a45407d Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 15 Jan 2025 15:32:07 +0100 Subject: [PATCH] Disable top-level configure run for the cross-builds The 'target' configurations currently trigger the 'host' configure command line, and are duplication of the existing rule we have for the host machines. Disable the top-level configure checks for the 'target' builds completely. Fixes: QTBUG-132799 Change-Id: Ia06dde53825e882e78a8c6be9e62779aaedcebf4 Reviewed-by: Toni Saario (cherry picked from commit 6f0c6b1614d7f0f336d656da947e7ca09cfe4145) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 5b0d2e87d0fcef5a56d4f04c0bc0c07bd615ffd7) --- coin/instructions/coin_qt_configure.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/coin/instructions/coin_qt_configure.yaml b/coin/instructions/coin_qt_configure.yaml index c1650256..a8aebd7d 100644 --- a/coin/instructions/coin_qt_configure.yaml +++ b/coin/instructions/coin_qt_configure.yaml @@ -47,3 +47,20 @@ instructions: condition: property property: features contains_value: UseConfigure +disable_if: + condition: or + conditions: + - condition: property + property: target.osVersion + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks] + - condition: and + conditions: + - condition: property + property: target.os + equals_value: Windows + - condition: property + property: target.arch + not_equals_property: host.arch + - condition: property + property: features + not_contains_value: "DebianPackaging"