diff options
| author | Simo Fält <simo.falt@qt.io> | 2023-05-25 11:19:15 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2023-05-25 11:19:15 +0300 |
| commit | d8f02ce77a4143aa4e7e6c4f7892e6a943c46b3c (patch) | |
| tree | eb92573ddeb44c25697f2d883d243a89c0d98b68 /coin | |
| parent | ca0519cb3f6b62e3b61ba74f0c60eac891dd3a15 (diff) | |
| parent | bd4180ffdd47d423b0bd2b995b09df474b8c5a81 (diff) | |
Merge tag 'v5.15.5-lts' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl
Qt For Python Release 5.15.5
Change-Id: Id8648afb982e4f1354257a0b523bc9c6f1acce2a
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/dependencies.yaml | 2 | ||||
| -rw-r--r-- | coin/module_config.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml index c2717bc08..af5c36172 100644 --- a/coin/dependencies.yaml +++ b/coin/dependencies.yaml @@ -1,6 +1,6 @@ product_dependency: ../../qt/tqtc-qt5.git: - ref: "ce5066de40100b04dee7087c7b860693b379c990" + ref: "743ae9f98d7cc67c4956886209f39fcd5a28466f" dependency_source: supermodule dependencies: [ "../../qt/qt3d", diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 6169ce910..99778cce6 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -18,7 +18,7 @@ accept_configuration: not_contains_value: -no-gui - condition: property # Following configs are not supported property: target.osVersion - not_in_values: [OPENSUSE_13_01, QEMU, WebAssembly, Ubuntu_18_04, SLES_12, SLES_15] + not_in_values: [OPENSUSE_13_01, QEMU, WebAssembly, Ubuntu_18_04, SLES_12, SLES_15, MacOS_10_15] - condition: property # MibnGW and msvc2015 are not supported property: target.compiler not_in_values: [Mingw, MSVC2015] |