From f00dbe103584d61dc585022cb303c42dd6ce699c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Bornemann?= Date: Thu, 12 Jan 2023 12:43:03 +0000 Subject: [PATCH] Revert "Revert "coin: Build qmake examples in non-qtbase repos"" This reverts commit 0f5af511eaca89d1b50c4772481bf3bdca9d45bc. Reason for revert: Examples build locally with qmake. Task-number: QTBUG-109383 Change-Id: Ief37cda919c32f8a6275ed7d8a5f1d38dc1b9ed9 Reviewed-by: Amir Masoud Abdol Reviewed-by: Fabian Kosmale --- .../qmake_examples/build_qmake_examples_instructions.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml b/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml index dc3417a05c..bbc31f7676 100644 --- a/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml +++ b/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml @@ -21,7 +21,11 @@ instructions: - condition: runtime env_var: COIN_CMAKE_ARGS contains_value: "QT_BUILD_EXAMPLES=ON" - # covers all cases for UseConfigure configs + # host case - condition: runtime - env_var: COIN_CONFIGURE_ARGS + env_var: CONFIGURE_ARGS + contains_value: "-make examples" + # target case + - condition: runtime + env_var: TARGET_CONFIGURE_ARGS contains_value: "-make examples"