diff options
| author | Lassi Lehikoinen <lassi.lehikoinen@qt.io> | 2021-01-20 08:39:59 +0200 |
|---|---|---|
| committer | Dan Ackers <dan.ackers@qt.io> | 2021-05-28 10:31:35 +0300 |
| commit | 72bd22db9f72c4d93774c79cae0760bdc39ce0de (patch) | |
| tree | f22d4c27be9ec9e3227c551d7652b3476be1d63d /coin | |
| parent | 1ff0ec46770254328e5ec492cbce1364936eda72 (diff) | |
Build QDB with CMake
Also some Qt6 related changes.
Task-number: QTBUG-86118
Change-Id: Id5bdf646071fcc10415945dfae73b2c66e53f7a7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/dependencies.yaml | 2 | ||||
| -rw-r--r-- | coin/module_config.yaml | 8 | ||||
| -rw-r--r-- | coin/product_dependencies.yaml | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml index bb16e29..791bbc8 100644 --- a/coin/dependencies.yaml +++ b/coin/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../../qt/qtbase: - ref: 3a6d8df5219653b043bd642668cee193f563ec84 + ref: 516316e9a24fc3a290ce220a9a6cda0af541ca4c required: true diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 0000000..4dc430e --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,8 @@ +version: 2 + +instructions: + Build: + - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" + + Test: + - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml" diff --git a/coin/product_dependencies.yaml b/coin/product_dependencies.yaml index 51fbd2d..f2ad3b9 100644 --- a/coin/product_dependencies.yaml +++ b/coin/product_dependencies.yaml @@ -1,3 +1,3 @@ dependencies: ../../qt/qt5.git: - ref: "5.15" + ref: "6.1" |