diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-10 13:14:45 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-11 13:22:03 +0200 |
| commit | 6400613503e18ab9dd56d200332659bbd745e7fd (patch) | |
| tree | 3bc82fd408660851ced850ae19700fc13621f2b3 /coin | |
| parent | 97c9a2605cc91c3f0bd837d8283d0245d9ff0057 (diff) | |
| download | qtqa-6400613503e18ab9dd56d200332659bbd745e7fd.tar.gz | |
Revert "CMake: Temporarily remove the yaml instruction files"
There's a new dev branch in qtqa which we can use for CMake builds
that need module_config.yaml files.
Reverting this in the dev branch makes sure not to break other
5.x branches that use qtqa/master, making sure the repo is built
with the old Coin hardcoded instructions, instead of the yaml Coin
instructions.
This reverts commit d4c8d29883ab2274e14c36b816d9dc123f633b3e.
Task-number: QTBUG-84233
Change-Id: If18d64a7bcc8a316d0256ecf8b6d276990fdd454
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/module_config.yaml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 0000000..8b9b6c8 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,15 @@ +version: 2 +accept_configuration: + condition: property + property: features + not_contains_value: Disable + +instructions: + Build: + - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" + + Test: + - type: EnvironmentVariable + variableName: Dummy + variableValue: dummy + |