From 0f5af511eaca89d1b50c4772481bf3bdca9d45bc Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Sat, 10 Dec 2022 10:49:27 +0000 Subject: [PATCH] Revert "coin: Build qmake examples in non-qtbase repos" This reverts commit 3cb32187978d401b01e079d86605f5a7ae1477e8. Reason for revert: Breaks in qtdeclarative Change-Id: Iefe2954826bca80ebb2aecb8e8d8367290c218d0 Reviewed-by: Alexandru Croitor --- .../qmake_examples/build_qmake_examples_instructions.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml b/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml index bbc31f7676a..dc3417a05cc 100644 --- a/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml +++ b/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml @@ -21,11 +21,7 @@ instructions: - condition: runtime env_var: COIN_CMAKE_ARGS contains_value: "QT_BUILD_EXAMPLES=ON" - # host case + # covers all cases for UseConfigure configs - condition: runtime - env_var: CONFIGURE_ARGS - contains_value: "-make examples" - # target case - - condition: runtime - env_var: TARGET_CONFIGURE_ARGS + env_var: COIN_CONFIGURE_ARGS contains_value: "-make examples"