diff options
author | Jörg Bornemann <joerg.bornemann@qt.io> | 2023-01-12 12:43:03 +0000 |
---|---|---|
committer | Jörg Bornemann <joerg.bornemann@qt.io> | 2023-01-16 18:18:28 +0000 |
commit | f00dbe103584d61dc585022cb303c42dd6ce699c (patch) | |
tree | 5d00e84fa3ae3b4e681450e61cfd334568ef6330 | |
parent | ce1506355fdc9dd9df809963ee88c1f30524ceff (diff) | |
download | qtbase-f00dbe103584d61dc585022cb303c42dd6ce699c.tar.gz |
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 <amir.abdol@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r-- | coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml | 8 |
1 files 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" |